osmux: Erase references to bsc-nat
Change-Id: I21ab7134de577278175132fc78431a249de76731
diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h
index 930557d..c6d628e 100644
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -162,9 +162,8 @@
/* 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;
diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c
index 77de23f..2ca3b66 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -442,7 +442,7 @@
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;
}
diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c
index 4581b76..26a44c6 100644
--- a/src/libosmo-mgcp/mgcp_msg.c
+++ b/src/libosmo-mgcp/mgcp_msg.c
@@ -202,7 +202,7 @@
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;
}
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 8ffdf31..e20868b 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -657,7 +657,7 @@
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.