<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19415">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">socket: add osmo_sockaddr_cmp()<br><br>Compare two osmo_sockaddr.<br><br>Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6<br>---<br>M include/osmocom/core/socket.h<br>M src/socket.c<br>2 files changed, 31 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h</span><br><span>index 4441449..e417f42 100644</span><br><span>--- a/include/osmocom/core/socket.h</span><br><span>+++ b/include/osmocom/core/socket.h</span><br><span>@@ -113,5 +113,7 @@</span><br><span> </span><br><span> int osmo_sock_local_ip(char *local_ip, const char *remote_ip);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* (!EMBEDDED) */</span><br><span> /*! @} */</span><br><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 6c06063..803af31 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -1662,6 +1662,35 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Compare two osmo_sockaddr.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] a</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] b</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return 0 if a and b are equal. Otherwise it follows memcmp()</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a == b)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!a)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!b)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->u.sa.sa_family != b->u.sa.sa_family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return OSMO_CMP(a->u.sa.sa_family, b->u.sa.sa_family);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (a->u.sa.sa_family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ return memcmp(&a->u.sin, &b->u.sin, sizeof(struct sockaddr_in));</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ return memcmp(&a->u.sin6, &b->u.sin6, sizeof(struct sockaddr_in6));</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fallback to memcmp for remaining AF over the full osmo_sockaddr length */</span><br><span style="color: hsl(120, 100%, 40%);">+ return memcmp(a, b, sizeof(struct osmo_sockaddr));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* HAVE_SYS_SOCKET_H */</span><br><span> </span><br><span> /*! @} */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19415">change 19415</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/+/19415"/><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: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 </div>
<div style="display:none"> Gerrit-Change-Number: 19415 </div>
<div style="display:none"> Gerrit-PatchSet: 19 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>