<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11377">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: Don't process regular osmux frames if disabled by cfg<br><br>Prior to this commit, the check was only done on legacy dummy frames.<br><br>Port from openbsc a42d4584fd01c9cd1021fab609bdaaafe859c13a.<br>Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>1 file changed, 12 insertions(+), 6 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 2e58c55..2e6307e 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -331,6 +331,12 @@</span><br><span>      if (!msg)</span><br><span>            return -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        if (!cfg->osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                   "bsc-nat wants to use Osmux but bsc did not request it\n");</span><br><span style="color: hsl(120, 100%, 40%);">+            goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  /* not any further processing dummy messages */</span><br><span>      if (msg->data[0] == MGCP_DUMMY_LOAD)</span><br><span>              goto out;</span><br><span>@@ -382,12 +388,6 @@</span><br><span>     LOGP(DLMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n",</span><br><span>         inet_ntoa(addr->sin_addr));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!cfg->osmux) {</span><br><span style="color: hsl(0, 100%, 40%);">-           LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                     "bsc wants to use Osmux but bsc-nat did not request it\n");</span><br><span style="color: hsl(0, 100%, 40%);">-              goto out;</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    /* extract the osmux CID from the dummy message */</span><br><span>   memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid));</span><br><span> </span><br><span>@@ -433,6 +433,12 @@</span><br><span>  if (!msg)</span><br><span>            return -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        if (!cfg->osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                   "bsc wants to use Osmux but bsc-nat did not request it\n");</span><br><span style="color: hsl(120, 100%, 40%);">+            goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  /* not any further processing dummy messages */</span><br><span>      if (msg->data[0] == MGCP_DUMMY_LOAD)</span><br><span>              return osmux_handle_dummy(cfg, &addr, msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11377">change 11377</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/11377"/><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: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 </div>
<div style="display:none"> Gerrit-Change-Number: 11377 </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>