cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

osmux: Erase references to bsc-nat 

Change-Id: I21ab7134de577278175132fc78431a249de76731
This commit is contained in:
Pau Espin 2022-10-06 18:24:21 +02:00
parent c0e1b1aec5
commit c7c8e649f1
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/osmocom/mgcp/mgcp.h
View File

@ -162,9 +162,8 @@ struct mgcp_config {
/* addr to bind the server to */
char *osmux_addr_v4;
char *osmux_addr_v6;
/* The BSC-NAT may ask for enabling osmux on demand. This tells us if
* the osmux socket is already initialized.
*/
/* The osmux socket is allocated on demand (1st time used).
* This tells us if the osmux socket is already initialized. */
bool osmux_initialized;
/* osmux batch factor: from 1 to 4 maximum */
int osmux_batch;

2
src/libosmo-mgcp-client/mgcp_client.c
View File

@ -442,7 +442,7 @@ static int mgcp_parse_osmux_cid(const char *line)
osmux_cid, OSMUX_CID_MAX);
return -2;
}
LOGP(DLMGCP, LOGL_DEBUG, "bsc-nat offered Osmux CID %u\n", osmux_cid);
LOGP(DLMGCP, LOGL_DEBUG, "MGW offered Osmux CID %u\n", osmux_cid);
return osmux_cid;
}

2
src/libosmo-mgcp/mgcp_msg.c
View File

@ -202,7 +202,7 @@ int mgcp_parse_osmux_cid(const char *line)
osmux_cid, OSMUX_CID_MAX);
return -2;
}
LOGP(DLMGCP, LOGL_DEBUG, "bsc-nat offered Osmux CID %u\n", osmux_cid);
LOGP(DLMGCP, LOGL_DEBUG, "MGCP client offered Osmux CID %u\n", osmux_cid);
return osmux_cid;
}

2
src/libosmo-mgcp/mgcp_osmux.c
View File

@ -657,7 +657,7 @@ int osmux_send_dummy(struct mgcp_conn_rtp *conn)
return mgcp_udp_send(osmux_fd_v4.fd, &conn->end.addr, (char *)osmuxh, buf_len);
}
/* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */
/* Keeps track of locally allocated Osmux circuit ID. +7 to round up to 8 bit boundary. */
static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1 + 7) / 8];
/*! count the number of taken OSMUX cids.