<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16336">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsup_server: send routing error back to the correct peer<br><br>If a peer attempts to add a route to an ipa-name that we already have in the<br>routing system, don't send the routing error to the peer that already has the<br>name, but to the peer that attempts to re-use it and would cause the collision.<br><br>This is fixing a situation where for example a locally attached MSC has name<br>'MSC-1', and a remote site is proxying GSUP here for a remote MSC that also has<br>the name 'MSC-1'. Send the routing error back to the proxy, not local 'MSC-1'.<br><br>Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6<br>---<br>M src/gsup_server.c<br>1 file changed, 14 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsup_server.c b/src/gsup_server.c</span><br><span>index 15d2f83..a5d496e 100644</span><br><span>--- a/src/gsup_server.c</span><br><span>+++ b/src/gsup_server.c</span><br><span>@@ -65,19 +65,30 @@</span><br><span> static void gsup_server_send_req_response(struct osmo_gsup_req *req, struct osmo_gsup_message *response)</span><br><span> {</span><br><span> struct osmo_gsup_server *server = req->cb_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_cni_peer_id *routing;</span><br><span> struct osmo_gsup_conn *conn = NULL;</span><br><span> struct msgb *msg = osmo_gsup_msgb_alloc("GSUP Tx");</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (req->source_name.type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (response->message_type == OSMO_GSUP_MSGT_ROUTING_ERROR</span><br><span style="color: hsl(120, 100%, 40%);">+ && !osmo_cni_peer_id_is_empty(&req->via_proxy)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If a routing error occured, we need to route back via the immediate sending peer, not via the</span><br><span style="color: hsl(120, 100%, 40%);">+ * intended final recipient -- because one source of routing errors is a duplicate name for a recipient.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If we resolve to req->source_name, we may send to a completely unrelated recipient. */</span><br><span style="color: hsl(120, 100%, 40%);">+ routing = &req->via_proxy;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ routing = &req->source_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (routing->type) {</span><br><span> case OSMO_CNI_PEER_ID_IPA_NAME:</span><br><span style="color: hsl(0, 100%, 40%);">- conn = gsup_route_find_by_ipa_name(server, &req->source_name.ipa_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = gsup_route_find_by_ipa_name(server, &routing->ipa_name);</span><br><span> break;</span><br><span> default:</span><br><span> LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP peer id kind not supported: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_cni_peer_id_type_name(req->source_name.type));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cni_peer_id_type_name(routing->type));</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!conn) {</span><br><span> LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP client that sent this request not found, cannot respond\n");</span><br><span> msgb_free(msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16336">change 16336</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-hlr/+/16336"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 </div>
<div style="display:none"> Gerrit-Change-Number: 16336 </div>
<div style="display:none"> Gerrit-PatchSet: 17 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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>