<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16161">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSUP: rename E_ROUTING_ERROR to ROUTING_ERROR<br><br>GSUP routing was introduced when adding the E interface. Hence that was the<br>first realm where routing errors could occur. I did notice back then that this<br>message type was special: it does not convey a response to a particular message<br>kind -- it does not make sense, for example, to return an Updating Location<br>Error cause, and do that for all conceivable message types. Instead, this tells<br>the sender that a deeper error exists, i.e. that the desired peer is completely<br>gone and unreachable.<br><br>I did not foresee though that for D-GSM, there would also be arbitrary GSUP<br>proxy routing, and that this error is not limited to E interface semantics.<br>From today's point of view, adding the "_E_" in the name was a mistake.<br><br>Remove that "_E_" to yield OSMO_GSUP_MSGT_ROUTING_ERROR (with unchanged message<br>type discriminator), but provide a #define linking the old name<br>OSMO_GSUP_MSGT_E_ROUTING_ERROR to the new one.<br><br>The only visible change should be that osmo_gsup_message_type_names[] now<br>returns the new name without "_E_". I am not aware of any regression test<br>fallout from that.<br><br>Change-Id: Ic8e8bd11522d6c51ac7aaf946516cbce26bc6e1e<br>---<br>M include/osmocom/gsm/gsup.h<br>M src/gsm/gsup.c<br>2 files changed, 4 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h</span><br><span>index 49ddb74..c883dfb 100644</span><br><span>--- a/include/osmocom/gsm/gsup.h</span><br><span>+++ b/include/osmocom/gsm/gsup.h</span><br><span>@@ -196,9 +196,11 @@</span><br><span> OSMO_GSUP_MSGT_E_CLOSE = 0b01000111,</span><br><span> OSMO_GSUP_MSGT_E_ABORT = 0b01001011,</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_GSUP_MSGT_E_ROUTING_ERROR = 0b01001110,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_MSGT_ROUTING_ERROR = 0b01001110,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_GSUP_MSGT_E_ROUTING_ERROR OSMO_GSUP_MSGT_ROUTING_ERROR</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00)</span><br><span> #define OSMO_GSUP_IS_MSGT_ERROR(msgt) (((msgt) & 0b00000011) == 0b01)</span><br><span> #define OSMO_GSUP_TO_MSGT_ERROR(msgt) (((msgt) & 0b11111100) | 0b01)</span><br><span>diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c</span><br><span>index 2f9d85d..ad7a2a4 100644</span><br><span>--- a/src/gsm/gsup.c</span><br><span>+++ b/src/gsm/gsup.c</span><br><span>@@ -101,7 +101,7 @@</span><br><span> OSMO_VALUE_STRING(OSMO_GSUP_MSGT_E_CLOSE),</span><br><span> OSMO_VALUE_STRING(OSMO_GSUP_MSGT_E_ABORT),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(OSMO_GSUP_MSGT_E_ROUTING_ERROR),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_ROUTING_ERROR),</span><br><span> </span><br><span> { 0, NULL }</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/16161">change 16161</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/libosmocore/+/16161"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic8e8bd11522d6c51ac7aaf946516cbce26bc6e1e </div>
<div style="display:none"> Gerrit-Change-Number: 16161 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>