<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11379">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: Make func handling dummy frames independent of endp type<br><br>Port from openbsc 8f321179747f64819d940d72d0212192f69284ca.<br>Change-Id: I3e16217737fd5ffb95c166c5f7344492cb6a6263<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>1 file changed, 9 insertions(+), 8 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 9081873..38cd3bd 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -387,30 +387,31 @@</span><br><span> </span><br><span> /* This is called from the bsc-nat */</span><br><span> static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr,</span><br><span style="color: hsl(0, 100%, 40%);">-                        struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+                             struct msgb *msg, int endp_type)</span><br><span> {</span><br><span>  struct mgcp_endpoint *endp;</span><br><span>  uint8_t osmux_cid;</span><br><span style="color: hsl(0, 100%, 40%);">-      struct mgcp_conn_rtp *conn_net = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+        struct mgcp_conn_rtp *conn = NULL;</span><br><span> </span><br><span>       if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0)</span><br><span>          goto out;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS);</span><br><span style="color: hsl(120, 100%, 40%);">+        endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, endp_type);</span><br><span>   if (!endp) {</span><br><span>                 LOGP(DLMGCP, LOGL_ERROR,</span><br><span>                  "Cannot find endpoint for Osmux CID %d\n", osmux_cid);</span><br><span>                goto out;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (!conn_net)</span><br><span style="color: hsl(120, 100%, 40%);">+        /* FIXME: Get rid of CONN_ID_XXX! */</span><br><span style="color: hsl(120, 100%, 40%);">+  conn = mgcp_conn_get_rtp(endp, endp_type == MGCP_DEST_BTS ? CONN_ID_NET : CONN_ID_BTS);</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!conn)</span><br><span>           goto out;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (conn_net->osmux.state == OSMUX_STATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+  if (conn->osmux.state == OSMUX_STATE_ENABLED)</span><br><span>             goto out;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (osmux_enable_conn(endp, conn_net, &addr->sin_addr, addr->sin_port) < 0 ) {</span><br><span style="color: hsl(120, 100%, 40%);">+   if (osmux_enable_conn(endp, conn, &addr->sin_addr, addr->sin_port) < 0 ) {</span><br><span>              LOGP(DLMGCP, LOGL_ERROR,</span><br><span>                  "Could not enable osmux in endpoint 0x%x\n",</span><br><span>               ENDPOINT_NUMBER(endp));</span><br><span>@@ -446,7 +447,7 @@</span><br><span> </span><br><span>       /* not any further processing dummy messages */</span><br><span>      if (msg->data[0] == MGCP_DUMMY_LOAD)</span><br><span style="color: hsl(0, 100%, 40%);">-         return osmux_handle_dummy(cfg, &addr, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return osmux_handle_dummy(cfg, &addr, msg, MGCP_DEST_BTS);</span><br><span> </span><br><span>   rem = msg->len;</span><br><span>   while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11379">change 11379</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/11379"/><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: I3e16217737fd5ffb95c166c5f7344492cb6a6263 </div>
<div style="display:none"> Gerrit-Change-Number: 11379 </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>