<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11376">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled<br><br>Port from openbsc 37a0307b6193c9b108cfd1aa2a88517a8b5cb907.<br>Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>1 file changed, 8 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index bc9eca2..2e58c55 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -641,12 +641,20 @@</span><br><span>                   LOGP(DLMGCP, LOGL_ERROR,</span><br><span>                          "Could not activate osmux for conn:%s\n",</span><br><span>                          mgcp_conn_dump(conn->conn));</span><br><span style="color: hsl(120, 100%, 40%);">+                  return 0;</span><br><span>            }</span><br><span>            LOGP(DLMGCP, LOGL_ERROR,</span><br><span>                  "Osmux CID %u for %s:%u is now enabled\n",</span><br><span>                 conn->osmux.cid, inet_ntoa(conn->end.addr),</span><br><span>                    endp->cfg->osmux_port);</span><br><span>   }</span><br><span style="color: hsl(120, 100%, 40%);">+     if(conn->osmux.state != OSMUX_STATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                   "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                  inet_ntoa(conn->end.addr), conn->osmux.cid,</span><br><span style="color: hsl(120, 100%, 40%);">+                     ENDPOINT_NUMBER(endp), conn->osmux.state);</span><br><span style="color: hsl(120, 100%, 40%);">+                 return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span>    LOGP(DLMGCP, LOGL_DEBUG,</span><br><span>          "sending OSMUX dummy load to %s CID %u\n",</span><br><span>         inet_ntoa(conn->end.addr), conn->osmux.cid);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11376">change 11376</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11376"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36 </div>
<div style="display:none"> Gerrit-Change-Number: 11376 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>