Change in osmo-mgw[master]: osmux: allow enabling osmux only on correct activating state

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11380 )

Change subject: osmux: allow enabling osmux only on correct activating state
......................................................................

osmux: allow enabling osmux only on correct activating state

State ACTIVATING is set once negotiation between the 2 parts went
successfuly.

Port from openbsc 96bd7b075a59eb051079152241b127ca944b0781.
Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 38cd3bd..2828d83 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -536,9 +536,9 @@
 	uint16_t osmux_dummy = endp->cfg->osmux_dummy;
 
 	/* Check if osmux is enabled for the specified connection */
-	if (conn->osmux.state == OSMUX_STATE_DISABLED) {
-		LOGP(DLMGCP, LOGL_ERROR, "OSMUX not enabled for conn:%s\n",
-		     mgcp_conn_dump(conn->conn));
+	if (conn->osmux.state != OSMUX_STATE_ACTIVATING) {
+		LOGP(DLMGCP, LOGL_ERROR, "conn:%s didn't negotiate Osmux, state %d\n",
+		     mgcp_conn_dump(conn->conn), conn->osmux.state);
 		return -1;
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/11380
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61
Gerrit-Change-Number: 11380
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181016/e9ca7e14/attachment.htm>