<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11335">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: 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>Change-Id: Ief4e62fe68a11a60d90292c72d1263fd1f728356<br>---<br>M openbsc/src/libmgcp/mgcp_osmux.c<br>1 file changed, 12 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/35/11335/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>index 33f5721..7590f18 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>@@ -275,6 +275,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(DMGCP, 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>@@ -319,12 +325,6 @@</span><br><span> LOGP(DMGCP, 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(DMGCP, 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>@@ -365,6 +365,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(DMGCP, 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/11335">change 11335</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/11335"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ief4e62fe68a11a60d90292c72d1263fd1f728356 </div>
<div style="display:none"> Gerrit-Change-Number: 11335 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>