<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12777">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Max: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSUP: deprecate osmo_gsup_get_err_msg_type()<br><br>Replace osmo_gsup_get_err_msg_type() with a wrapper to<br>OSMO_GSUP_TO_MSGT_ERROR(). This macro assumes, that all error messages<br>are (request message | 0x000001). Add a big comment header for<br>osmo_gsup_message_type, describing this already implicitly followed rule<br>and therefore making it explicit.<br><br>With this change, we don't need to maintain the request -> error message<br>mapping in osmo_gsup_get_err_msg_type() anymore.<br><br>Related: Iec1b4ce4b7d8eb157406f006e1c4241e8fba2cd6 (osmo-gsm-manuals)<br>Change-Id: I46d9f2327791978710e2f90b4d28a3761d723d8f<br>---<br>M include/osmocom/gsm/gsup.h<br>M src/gsm/gsup.c<br>2 files changed, 17 insertions(+), 30 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 5dc2a82..29ea11a 100644</span><br><span>--- a/include/osmocom/gsm/gsup.h</span><br><span>+++ b/include/osmocom/gsm/gsup.h</span><br><span>@@ -105,7 +105,18 @@</span><br><span> _OSMO_GSUP_IEI_END_MARKER</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! GSUP message type */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! GSUP message type</span><br><span style="color: hsl(120, 100%, 40%);">+ * Make sure that new messages follow this scheme:</span><br><span style="color: hsl(120, 100%, 40%);">+ * .----------------------------.</span><br><span style="color: hsl(120, 100%, 40%);">+ * | Ending Bits | Category |</span><br><span style="color: hsl(120, 100%, 40%);">+ * |----------------------------|</span><br><span style="color: hsl(120, 100%, 40%);">+ * | 00 | Request |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | 01 | Error |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | 10 | Result |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | 11 | Other |</span><br><span style="color: hsl(120, 100%, 40%);">+ * '----------------------------'</span><br><span style="color: hsl(120, 100%, 40%);">+ * Request, Error and Result messages must only differ in these last two bits.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> enum osmo_gsup_message_type {</span><br><span> OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST = 0b00000100,</span><br><span> OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR = 0b00000101,</span><br><span>@@ -280,6 +291,7 @@</span><br><span> int osmo_gsup_decode(const uint8_t *data, size_t data_len,</span><br><span> struct osmo_gsup_message *gsup_msg);</span><br><span> int osmo_gsup_encode(struct msgb *msg, const struct osmo_gsup_message *gsup_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsup_get_err_msg_type(enum osmo_gsup_message_type type_in);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsup_get_err_msg_type(enum osmo_gsup_message_type type_in)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_DEPRECATED("Use OSMO_GSUP_TO_MSGT_ERROR() instead");</span><br><span> </span><br><span> /*! @} */</span><br><span>diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c</span><br><span>index 3d2a8e2..a089322 100644</span><br><span>--- a/src/gsm/gsup.c</span><br><span>+++ b/src/gsm/gsup.c</span><br><span>@@ -95,36 +95,11 @@</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! return the error message type corresponding to \a type_in</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns matching error message type; -1 on error */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! return the error message type corresponding to \a type_in.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Deprecated, use OSMO_GSUP_TO_MSGT_ERROR() instead. */</span><br><span> int osmo_gsup_get_err_msg_type(enum osmo_gsup_message_type type_in)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (type_in) {</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_PURGE_MS_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_PURGE_MS_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_INSERT_DATA_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_INSERT_DATA_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_DELETE_DATA_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_DELETE_DATA_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_LOCATION_CANCEL_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_PROC_SS_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_PROC_SS_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_READY_FOR_SM_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- return OSMO_GSUP_MSGT_CHECK_IMEI_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ return OSMO_GSUP_TO_MSGT_ERROR(type_in);</span><br><span> }</span><br><span> </span><br><span> static int decode_pdp_info(uint8_t *data, size_t data_len,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12777">change 12777</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/12777"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I46d9f2327791978710e2f90b4d28a3761d723d8f </div>
<div style="display:none"> Gerrit-Change-Number: 12777 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </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-Reviewer: osmith <osmith@sysmocom.de> </div>