<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19984">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: 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;">add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp()<br><br>Avoid magic number 0xffffffff and rather provide a mask value for all address<br>components.<br><br>Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07<br>---<br>M include/osmocom/sigtran/sccp_sap.h<br>M src/sccp_user.c<br>2 files changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h</span><br><span>index 817ac45..de9b24c 100644</span><br><span>--- a/include/osmocom/sigtran/sccp_sap.h</span><br><span>+++ b/include/osmocom/sigtran/sccp_sap.h</span><br><span>@@ -51,6 +51,7 @@</span><br><span> #define OSMO_SCCP_ADDR_T_SSN      0x0004 /* subsystem number */</span><br><span> #define OSMO_SCCP_ADDR_T_IPv4  0x0008</span><br><span> #define OSMO_SCCP_ADDR_T_IPv6 0x0010</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_SCCP_ADDR_T_MASK   0x001f</span><br><span> </span><br><span> /* Q.713 3.4.1 + RFC 3868 3.10.2.3 */</span><br><span> enum osmo_sccp_routing_ind {</span><br><span>diff --git a/src/sccp_user.c b/src/sccp_user.c</span><br><span>index e1329ac..880cab1 100644</span><br><span>--- a/src/sccp_user.c</span><br><span>+++ b/src/sccp_user.c</span><br><span>@@ -342,8 +342,8 @@</span><br><span>  * The SCCP addresses' Routing Indicator is not compared, see osmo_sccp_addr_ri_cmp().</span><br><span>  * \param[in] a  left side.</span><br><span>  * \param[in] b  right side.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] presence_criteria  A bitmask of OSMO_SCCP_ADDR_T_* values, or 0xffffffff to compare all parts, except the</span><br><span style="color: hsl(0, 100%, 40%);">- *                               routing indicator.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] presence_criteria  A bitmask of OSMO_SCCP_ADDR_T_* values, or OSMO_SCCP_ADDR_T_MASK to compare all parts,</span><br><span style="color: hsl(120, 100%, 40%);">+ *                               except the routing indicator.</span><br><span>  * \return -1 if a < b, 1 if a > b, and 0 if all checked values match.</span><br><span>  */</span><br><span> int osmo_sccp_addr_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b, uint32_t presence_criteria)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19984">change 19984</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/libosmo-sccp/+/19984"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I13ff0858e496c4392b8e1590d62f7eb80f191a07 </div>
<div style="display:none"> Gerrit-Change-Number: 19984 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>