Change in openbsc[master]: mgcp: 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/11338 )

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

mgcp: osmux: allow enabling osmux only on correct activating state

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

Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index b46ea10..6be5eb2 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -452,9 +452,9 @@
 	 */
 	static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1);
 
-	if (endp->osmux.state == OSMUX_STATE_DISABLED) {
-		LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't request Osmux\n",
-		     ENDPOINT_NUMBER(endp));
+	if (endp->osmux.state != OSMUX_STATE_ACTIVATING) {
+		LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't negotiate Osmux, state %d\n",
+		     ENDPOINT_NUMBER(endp), endp->osmux.state);
 		return -1;
 	}
 

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

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d
Gerrit-Change-Number: 11338
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/20181015/740f72c8/attachment.htm>