Change in osmo-mgw[master]: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not ...

[Harald Welte]

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

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

osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled

Port from openbsc 37a0307b6193c9b108cfd1aa2a88517a8b5cb907.
Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 8 insertions(+), 0 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 bc9eca2..2e58c55 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -641,12 +641,20 @@
 			LOGP(DLMGCP, LOGL_ERROR,
 			     "Could not activate osmux for conn:%s\n",
 			     mgcp_conn_dump(conn->conn));
+			return 0;
 		}
 		LOGP(DLMGCP, LOGL_ERROR,
 		     "Osmux CID %u for %s:%u is now enabled\n",
 		     conn->osmux.cid, inet_ntoa(conn->end.addr),
 		     endp->cfg->osmux_port);
 	}
+	if(conn->osmux.state != OSMUX_STATE_ENABLED) {
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n",
+		     inet_ntoa(conn->end.addr), conn->osmux.cid,
+		     ENDPOINT_NUMBER(endp), conn->osmux.state);
+		     return 0;
+	}
 	LOGP(DLMGCP, LOGL_DEBUG,
 	     "sending OSMUX dummy load to %s CID %u\n",
 	     inet_ntoa(conn->end.addr), conn->osmux.cid);

-- 
To view, visit https://gerrit.osmocom.org/11376
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: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36
Gerrit-Change-Number: 11376
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/f52d7b1b/attachment.htm>