Change in openbsc[master]: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmu...

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11334 )

Change subject: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled
......................................................................

mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled

Change-Id: I5244cb9304adef3aa612b8126bf95e77562c801c
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 8 insertions(+), 0 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 71e8eae..33f5721 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -530,12 +530,20 @@
 			LOGP(DMGCP, LOGL_ERROR,
 			     "Could not activate osmux in endpoint 0x%x\n",
 			     ENDPOINT_NUMBER(endp));
+			return 0;
 		}
 		LOGP(DMGCP, LOGL_ERROR,
 		     "Osmux CID %u for %s:%u is now enabled\n",
 		     endp->osmux.cid, inet_ntoa(endp->net_end.addr),
 		     endp->cfg->osmux_port);
 	}
+	if(endp->osmux.state != OSMUX_STATE_ENABLED) {
+		LOGP(DMGCP, LOGL_ERROR,
+		     "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n",
+		     inet_ntoa(endp->net_end.addr), endp->osmux.cid,
+		     ENDPOINT_NUMBER(endp), endp->osmux.state);
+		     return 0;
+	}
 	LOGP(DMGCP, LOGL_DEBUG,
 	     "sending OSMUX dummy load to %s CID %u\n",
 	     inet_ntoa(endp->net_end.addr), endp->osmux.cid);

-- 
To view, visit https://gerrit.osmocom.org/11334
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: I5244cb9304adef3aa612b8126bf95e77562c801c
Gerrit-Change-Number: 11334
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)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181015/0d8d01bd/attachment.htm>