pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29477 )
Change subject: osmux: Rename field s/init/initialized
......................................................................
osmux: Rename field s/init/initialized
Change-Id: Ic48de396b1d8a0774611b4a1c2248ba79bdaf044
---
M include/osmocom/mgcp/mgcp.h
M src/libosmo-mgcp/mgcp_osmux.c
M src/libosmo-mgcp/mgcp_protocol.c
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/77/29477/1
diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h
index c707f07..a4d4e6f 100644
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -164,7 +164,7 @@
/* The BSC-NAT may ask for enabling osmux on demand. This tells us if
* the osmux socket is already initialized.
*/
- bool osmux_init;
+ bool osmux_initialized;
/* osmux batch factor: from 1 to 4 maximum */
int osmux_batch;
/* osmux batch size (in bytes) */
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 65783f3..1f21888 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -492,7 +492,7 @@
osmo_sock_get_name2(osmux_fd.fd));
return ret;
}
- cfg->osmux_init = true;
+ cfg->osmux_initialized = true;
LOGP(DOSMUX, LOGL_INFO, "OSMUX socket listening on %s\n",
osmo_sock_get_name2(osmux_fd.fd));
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 506de34..e748c5b 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -740,7 +740,7 @@
*/
static int mgcp_osmux_setup(struct mgcp_endpoint *endp, const char *line)
{
- if (!endp->trunk->cfg->osmux_init) {
+ if (!endp->trunk->cfg->osmux_initialized) {
if (osmux_init(OSMUX_ROLE_BSC, endp->trunk) < 0) {
LOGPENDP(endp, DLMGCP, LOGL_ERROR, "Cannot init OSMUX\n");
return -3;
--
To view, visit
https://gerrit.osmocom.org/c/osmo-mgw/+/29477
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ic48de396b1d8a0774611b4a1c2248ba79bdaf044
Gerrit-Change-Number: 29477
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange