<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22669">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm48: add compare function for struct gprs_ra_id<br><br>Comparing struct gprs_ra_id using memcmp can be error prone, so lets add<br>a compare function to compare two struct gprs_ra_id values reliably.<br><br>Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada<br>Related: SYS#5103<br>---<br>M include/osmocom/gsm/gsm48.h<br>M src/gsm/gsm48.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 21 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/22669/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h</span><br><span>index f772f4a..4f6c0dc 100644</span><br><span>--- a/include/osmocom/gsm/gsm48.h</span><br><span>+++ b/include/osmocom/gsm/gsm48.h</span><br><span>@@ -104,6 +104,7 @@</span><br><span> void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf);</span><br><span> void gsm48_encode_ra(struct gsm48_ra_id *out, const struct gprs_ra_id *raid);</span><br><span> int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid) OSMO_DEPRECATED("Use gsm48_encode_ra() instead");</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_compare_ra(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2);</span><br><span> </span><br><span> int gsm48_number_of_paging_subchannels(struct gsm48_control_channel_descr *chan_desc);</span><br><span> </span><br><span>diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c</span><br><span>index c497c74..97f031a 100644</span><br><span>--- a/src/gsm/gsm48.c</span><br><span>+++ b/src/gsm/gsm48.c</span><br><span>@@ -1298,6 +1298,25 @@</span><br><span>        return 6;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Compare a TS 04.08 Routing Area Identifier</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] raid1 first Routing Area ID to compare.</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] raid2 second Routing Area ID to compare.</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \returns 0 if raid1 and raid2 match, -1 otherwise. */</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_compare_ra(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       if (raid1->mcc != raid2->mcc)</span><br><span style="color: hsl(120, 100%, 40%);">+           return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    if (raid1->mnc != raid2->mnc)</span><br><span style="color: hsl(120, 100%, 40%);">+           return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    if (raid1->mnc_3_digits != raid2->mnc_3_digits)</span><br><span style="color: hsl(120, 100%, 40%);">+         return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    if (raid1->lac != raid2->lac)</span><br><span style="color: hsl(120, 100%, 40%);">+           return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    if (raid1->rac != raid2->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> /*! Determine number of paging sub-channels</span><br><span>  *  \param[in] chan_desc Control Channel Description</span><br><span>  *  \returns number of paging sub-channels</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 584d761..426e281 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -326,6 +326,7 @@</span><br><span> gsm48_rr_msg_name;</span><br><span> gsm48_cc_state_name;</span><br><span> gsm48_construct_ra;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm48_compare_ra;</span><br><span> gsm48_encode_ra;</span><br><span> gsm48_hdr_gmm_cipherable;</span><br><span> gsm48_decode_bcd_number;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22669">change 22669</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/+/22669"/><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: I4d7558c04d9d01761516526086be5104bb2eeada </div>
<div style="display:none"> Gerrit-Change-Number: 22669 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>