<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13588">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSUP routing: use Kind IE<br><br>Include the GSUP Kind from original message in routing error responses.<br>Add the Kind to GSUP router logging.<br><br>Depends: Ic397a9f2c4a7224e47cab944c72e75ca5592efef (libosmocore)<br>Change-Id: I8dc3967d9372d63e9d57ca2608dd3316edb234a4<br>---<br>M src/hlr.c<br>1 file changed, 17 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/88/13588/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 2614f35..6d2f7ac 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -453,6 +453,7 @@</span><br><span> /* Prepare error message (before IEs get deallocated) */</span><br><span> gsup_err = talloc_zero(hlr_ctx, struct osmo_gsup_message);</span><br><span> OSMO_STRLCPY_ARRAY(gsup_err->imsi, gsup->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_err->kind = gsup->kind;</span><br><span> gsup_err->destination_name = talloc_memdup(gsup_err, gsup->destination_name, gsup->destination_name_len);</span><br><span> gsup_err->destination_name_len = gsup->destination_name_len;</span><br><span> gsup_err->message_type = OSMO_GSUP_MSGT_E_ROUTING_ERROR;</span><br><span>@@ -462,8 +463,9 @@</span><br><span> </span><br><span> /* Check for routing IEs */</span><br><span> if (!gsup->source_name || !gsup->source_name_len || !gsup->destination_name || !gsup->destination_name_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Can't forward GSUP message for IMSI %s (%s): missing routing IEs\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsup->imsi, osmo_gsup_message_type_name(gsup->message_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Can't forward GSUP message for IMSI %s (%s, kind %s): missing routing IEs\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup->imsi, osmo_gsup_message_type_name(gsup->message_type),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_kind_name(gsup->kind));</span><br><span> goto end;</span><br><span> }</span><br><span> </span><br><span>@@ -480,10 +482,11 @@</span><br><span> }</span><br><span> </span><br><span> /* Forward message without re-encoding (so we don't remove unknown IEs) */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_NOTICE, "Forwarding GSUP message for IMSI %s from %s to %s: %s\n", gsup->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "Forwarding GSUP message for IMSI %s from %s to %s: %s, kind %s\n", gsup->imsi,</span><br><span> osmo_quote_str_buf((const char *)gsup->source_name, gsup->source_name_len, buf, sizeof(buf)),</span><br><span> osmo_quote_str((const char *)gsup->destination_name, gsup->destination_name_len),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gsup_message_type_name(gsup->message_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_message_type_name(gsup->message_type),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_kind_name(gsup->kind));</span><br><span> </span><br><span> /* Remove incoming IPA header to be able to prepend and outgoing IPA header */</span><br><span> msgb_pull_to_l2(msg);</span><br><span>@@ -494,16 +497,19 @@</span><br><span> gsup = NULL;</span><br><span> if (ret == -ENODEV)</span><br><span> LOGP(DMAIN, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Can't forward GSUP message for IMSI %s from %s to %s (%s): destination not connected\n", gsup_err->imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_quote_str_buf((const char *)gsup_err->source_name, gsup_err->source_name_len, buf, sizeof(buf)),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_quote_str((const char *)gsup_err->destination_name, gsup_err->destination_name_len),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gsup_message_type_name(gsup_err->message_type));</span><br><span style="color: hsl(0, 100%, 40%);">- else if (ret)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Can't forward GSUP message for IMSI %s from %s to %s (%s): unknown error\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Can't forward GSUP message for IMSI %s from %s to %s (%s, kind %s): destination not connected\n",</span><br><span> gsup_err->imsi,</span><br><span> osmo_quote_str_buf((const char *)gsup_err->source_name, gsup_err->source_name_len, buf, sizeof(buf)),</span><br><span> osmo_quote_str((const char *)gsup_err->destination_name, gsup_err->destination_name_len),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gsup_message_type_name(gsup_err->message_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_message_type_name(gsup_err->message_type),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_kind_name(gsup_err->kind));</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (ret)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Can't forward GSUP message for IMSI %s from %s to %s (%s, kind %s): unknown error\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_err->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str_buf((const char *)gsup_err->source_name, gsup_err->source_name_len, buf, sizeof(buf)),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str((const char *)gsup_err->destination_name, gsup_err->destination_name_len),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_message_type_name(gsup_err->message_type),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_kind_name(gsup_err->kind));</span><br><span> </span><br><span> end:</span><br><span> /* Send error back to source */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13588">change 13588</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/13588"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8dc3967d9372d63e9d57ca2608dd3316edb234a4 </div>
<div style="display:none"> Gerrit-Change-Number: 13588 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>