<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13898">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Neels Hofmeyr: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hlr.c: fix: properly print the original message type in read_cb_forward()<br><br>Printing 'OSMO_GSUP_MSGT_E_ROUTING_ERROR' in routing error messages<br>instead of the original message type may be confusing. Let's store<br>the original message type, and change just before sending.<br><br>Fix for Change-Id: Ia4f345abc877baaf0a8f73b8988e6514d9589bf5<br>Change-Id: Ic1db1e089fc0f8e03653a9f05058e95d2adaee39<br>---<br>M src/hlr.c<br>1 file changed, 2 insertions(+), 1 deletion(-)<br><br></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 38422c8..3df700a 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -465,7 +465,7 @@</span><br><span>         gsup_err->message_class = gsup->message_class;</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 style="color: hsl(0, 100%, 40%);">-      gsup_err->message_type = OSMO_GSUP_MSGT_E_ROUTING_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_err->message_type = gsup->message_type;</span><br><span>   gsup_err->session_state = gsup->session_state;</span><br><span>         gsup_err->session_id = gsup->session_id;</span><br><span>       gsup_err->source_name = talloc_memdup(gsup_err, gsup->source_name, gsup->source_name_len);</span><br><span>@@ -508,6 +508,7 @@</span><br><span>    if (ret) {</span><br><span>           struct msgb *msg_err = msgb_alloc_headroom(1024+16, 16, "GSUP forward ERR response");</span><br><span>              OSMO_ASSERT(msg_err);</span><br><span style="color: hsl(120, 100%, 40%);">+         gsup_err->message_type = OSMO_GSUP_MSGT_E_ROUTING_ERROR;</span><br><span>          osmo_gsup_encode(msg_err, gsup_err);</span><br><span>                 LOGP_GSUP_FWD(gsup_err, LOGL_NOTICE, "Tx %s\n", osmo_gsup_message_type_name(gsup_err->message_type));</span><br><span>           osmo_gsup_conn_send(conn, msg_err);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13898">change 13898</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/13898"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic1db1e089fc0f8e03653a9f05058e95d2adaee39 </div>
<div style="display:none"> Gerrit-Change-Number: 13898 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>