<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19119">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_trunk: remove double check<br><br>At the moment, the trunk prefix is checked twice. Lets re-arange the<br>code a bit so that the check only happens once.<br><br>Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd<br>Related: OS#2547<br>---<br>M src/libosmo-mgcp/mgcp_trunk.c<br>1 file changed, 3 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/19119/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>index 185f0ee..43abe45 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>@@ -149,7 +149,7 @@</span><br><span> {</span><br><span>      size_t prefix_len;</span><br><span>   char epname_lc[MGCP_ENDPOINT_MAXLEN];</span><br><span style="color: hsl(0, 100%, 40%);">-   unsigned long int trunk_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+        int trunk_nr;</span><br><span> </span><br><span>       osmo_str_tolower_buf(epname_lc, sizeof(epname_lc), epname);</span><br><span>  epname = epname_lc;</span><br><span>@@ -159,13 +159,9 @@</span><br><span>           return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_E1_TRUNK) - 1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (strncmp(epname, MGCP_ENDPOINT_PREFIX_E1_TRUNK, prefix_len) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          trunk_nr = e1_trunk_nr_from_epname(epname);</span><br><span style="color: hsl(0, 100%, 40%);">-             if (trunk_nr < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                    return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  trunk_nr = e1_trunk_nr_from_epname(epname);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (trunk_nr > 0)</span><br><span>                 return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span>        /* Earlier versions of osmo-mgw were accepting endpoint names</span><br><span>         * without trunk prefix. This is normally not allowed, each MGCP</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19119">change 19119</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/c/osmo-mgw/+/19119"/><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-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd </div>
<div style="display:none"> Gerrit-Change-Number: 19119 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>