From b7f52b414e01f2108efa79b6c8fc2dd1ba970cef Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Sun, 25 Sep 2022 00:14:03 +0200 Subject: [PATCH] osmux: Rename field s/init/initialized Change-Id: Ic48de396b1d8a0774611b4a1c2248ba79bdaf044 --- include/osmocom/mgcp/mgcp.h | 2 +- src/libosmo-mgcp/mgcp_osmux.c | 2 +- src/libosmo-mgcp/mgcp_protocol.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index c707f0797..a4d4e6f2c 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -164,7 +164,7 @@ struct mgcp_config { /* 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 65783f370..1f21888b1 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -492,7 +492,7 @@ int osmux_init(int role, struct mgcp_trunk *trunk) 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 506de3462..e748c5b9e 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -740,7 +740,7 @@ uint32_t mgcp_rtp_packet_duration(const struct mgcp_endpoint *endp, */ 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;