<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22382">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm: Introduce osmo_{rai,cgi_ps}_cmp() APIs<br><br>Similar to what we already have for other data types, such as<br>osmo_lai_cmp or osmo_cgi_cmp.<br><br>Change-Id: I00e329bc5be8674b30267dec238e7656ddfc21db<br>---<br>M TODO-RELEASE<br>M include/osmocom/gsm/gsm23003.h<br>M src/gsm/gsm23003.c<br>M src/gsm/libosmogsm.map<br>4 files changed, 39 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 501f25b..e1b1507 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -13,3 +13,4 @@</span><br><span> libosmovty ABI change struct cmd_element: add a field for program specific attributes</span><br><span> libosmovty ABI change struct vty_app_info: optional program specific attributes description</span><br><span> libosmoctrl ABI change struct ctrl_handle changed size (new field "reply_cb" at the end)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmogsm new API osmo_rai_cmp(), osmo_cgi_ps_cmp()</span><br><span>diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h</span><br><span>index fbe0ca0..487379a 100644</span><br><span>--- a/include/osmocom/gsm/gsm23003.h</span><br><span>+++ b/include/osmocom/gsm/gsm23003.h</span><br><span>@@ -157,7 +157,9 @@</span><br><span> int osmo_mnc_cmp(uint16_t a_mnc, bool a_mnc_3_digits, uint16_t b_mnc, bool b_mnc_3_digits);</span><br><span> int osmo_plmn_cmp(const struct osmo_plmn_id *a, const struct osmo_plmn_id *b);</span><br><span> int osmo_lai_cmp(const struct osmo_location_area_id *a, const struct osmo_location_area_id *b);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_rai_cmp(const struct osmo_routing_area_id *a, const struct osmo_routing_area_id *b);</span><br><span> int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_cgi_ps_cmp(const struct osmo_cell_global_id_ps *a, const struct osmo_cell_global_id_ps *b);</span><br><span> </span><br><span> int osmo_gen_home_network_domain(char *out, const struct osmo_plmn_id *plmn);</span><br><span> int osmo_parse_home_network_domain(struct osmo_plmn_id *out, const char *in);</span><br><span>diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c</span><br><span>index ae498fa..c2b3de8 100644</span><br><span>--- a/src/gsm/gsm23003.c</span><br><span>+++ b/src/gsm/gsm23003.c</span><br><span>@@ -565,6 +565,23 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Compare two RAI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The order of comparison is MCC, MNC, LAC, RAC. See also osmo_lai_cmp().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param a[in] "Left" side RAI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param b[in] "Right" side RAI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 if the RAI are equal, -1 if a < b, 1 if a > b. */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_rai_cmp(const struct osmo_routing_area_id *a, const struct osmo_routing_area_id *b)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = osmo_lai_cmp(&a->lac, &b->lac);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->rac < b->rac)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->rac > b->rac)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Compare two CGI.</span><br><span> * The order of comparison is MCC, MNC, LAC, CI. See also osmo_lai_cmp().</span><br><span> * \param a[in] "Left" side CGI.</span><br><span>@@ -582,6 +599,23 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Compare two CGI-PS.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The order of comparison is MCC, MNC, LAC, RAC, CI. See also osmo_rai_cmp().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param a[in] "Left" side CGI-PS.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param b[in] "Right" side CGI-PS.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 if the CGI are equal, -1 if a < b, 1 if a > b. */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_cgi_ps_cmp(const struct osmo_cell_global_id_ps *a, const struct osmo_cell_global_id_ps *b)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = osmo_rai_cmp(&a->rai, &b->rai);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->cell_identity < b->cell_identity)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->cell_identity > b->cell_identity)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Generate TS 23.003 Section 19.2 Home Network Realm/Domain (text form)</span><br><span> * \param out[out] caller-provided output buffer, at least 33 bytes long</span><br><span> * \param plmn[in] Osmocom representation of PLMN ID (MCC + MNC)</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index de9a595..c314c20 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -410,6 +410,7 @@</span><br><span> osmo_lai_name;</span><br><span> osmo_lai_name_buf;</span><br><span> osmo_lai_name_c;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_rai_cmp;</span><br><span> osmo_rai_name;</span><br><span> osmo_rai_name_buf;</span><br><span> osmo_rai_name_c;</span><br><span>@@ -421,6 +422,7 @@</span><br><span> osmo_cgi_name_buf;</span><br><span> osmo_cgi_name_c;</span><br><span> osmo_cgi_name2;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_cgi_ps_cmp;</span><br><span> osmo_cgi_ps_name;</span><br><span> osmo_cgi_ps_name_buf;</span><br><span> osmo_cgi_ps_name_c;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22382">change 22382</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/+/22382"/><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: I00e329bc5be8674b30267dec238e7656ddfc21db </div>
<div style="display:none"> Gerrit-Change-Number: 22382 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </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>