<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16797">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  osmith: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ss7: Fix sccp_simple_server rejecting connections<br><br>Server addresses (and remote added ones) were not being copied to the<br>ASP and hence connections were not matches against the ASP when<br>connecting:<br><br>osmo_ss7.c:1820 (r=127.0.0.2:2905<->l=127.0.0.1:2905): m3ua connection<br>without matching ASP definition and no dynamic registration enabled, terminating<br><br>Related: OS#4355<br>Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e<br>---<br>M src/sccp_user.c<br>1 file changed, 12 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sccp_user.c b/src/sccp_user.c</span><br><span>index 39ebc71..9df5817 100644</span><br><span>--- a/src/sccp_user.c</span><br><span>+++ b/src/sccp_user.c</span><br><span>@@ -700,6 +700,7 @@</span><br><span>       struct osmo_ss7_as *as;</span><br><span>      struct osmo_ss7_route *rt;</span><br><span>   struct osmo_ss7_asp *asp;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct osmo_xua_server *oxs;</span><br><span>         char *as_name, *asp_name;</span><br><span> </span><br><span>        if (local_port < 0)</span><br><span>@@ -724,6 +725,15 @@</span><br><span>        asp = osmo_ss7_asp_find_or_create(ss7, asp_name, remote_port, local_port, prot);</span><br><span>     if (!asp)</span><br><span>            goto out_rt;</span><br><span style="color: hsl(120, 100%, 40%);">+  oxs = osmo_ss7_xua_server_find(ss7, prot, local_port);</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!oxs)</span><br><span style="color: hsl(120, 100%, 40%);">+             goto out_asp;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp,</span><br><span style="color: hsl(120, 100%, 40%);">+                                  (const char* const*)oxs->cfg.local.host,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   oxs->cfg.local.host_cnt) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+           goto out_asp;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, remote_ip) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+               goto out_asp;</span><br><span>        asp->cfg.is_server = true;</span><br><span>        asp->cfg.role = OSMO_SS7_ASP_ROLE_SG;</span><br><span>     osmo_ss7_as_add_asp(as, asp_name);</span><br><span>@@ -733,6 +743,8 @@</span><br><span> </span><br><span>         return ss7->sccp;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+out_asp:</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_ss7_asp_destroy(asp);</span><br><span> out_rt:</span><br><span>        osmo_ss7_route_destroy(rt);</span><br><span> out_as:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16797">change 16797</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/libosmo-sccp/+/16797"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e </div>
<div style="display:none"> Gerrit-Change-Number: 16797 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>