<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11842">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add osmo_sockaddrin_to_str_and_uint()<br><br>It's similar to osmo_sockaddr_to_str_and_uint() but does not require odd<br>typecasting for AF_INET case. Make osmo_sockaddr_to_str_and_uint() into<br>wrapper around new function and make sure to check for address family<br>before typecasting. Also use proper return type.<br><br>Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2<br>---<br>M include/osmocom/core/socket.h<br>M src/socket.c<br>2 files changed, 24 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/11842/1</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 28f89a5..0930de0 100644</span><br><span>--- a/include/osmocom/core/socket.h</span><br><span>+++ b/include/osmocom/core/socket.h</span><br><span>@@ -11,7 +11,8 @@</span><br><span> #include <stdbool.h></span><br><span> #include <stddef.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct sockaddr;</span><br><span style="color: hsl(120, 100%, 40%);">+#include <arpa/inet.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_fd;</span><br><span> </span><br><span> /* flags for osmo_sock_init. */</span><br><span>@@ -49,6 +50,8 @@</span><br><span> </span><br><span> unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,</span><br><span> const struct sockaddr *sa);</span><br><span style="color: hsl(120, 100%, 40%);">+size_t osmo_sockaddrin_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sockaddr_in *sin);</span><br><span> </span><br><span> int osmo_sock_unix_init(uint16_t type, uint8_t proto,</span><br><span> const char *socket_path, unsigned int flags);</span><br><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 0e17a28..698b126 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -569,6 +569,25 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Convert sockaddr_in to IP address as char string and port as uint16_t.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] addr String buffer to write IP address to, or NULL.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] addr_len Size of \a addr.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] port Pointer to uint16_t to write the port number to, or NULL.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] sin Sockaddr to convert.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns the required string buffer size, like osmo_strlcpy(), or 0 if \a addr is NULL.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+size_t osmo_sockaddrin_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sockaddr_in *sin)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (port)</span><br><span style="color: hsl(120, 100%, 40%);">+ *port = ntohs(sin->sin_port);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len);</span><br><span style="color: hsl(120, 100%, 40%);">+</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> /*! Convert sockaddr to IP address as char string and port as uint16_t.</span><br><span> * \param[out] addr String buffer to write IP address to, or NULL.</span><br><span> * \param[out] addr_len Size of \a addr.</span><br><span>@@ -581,11 +600,7 @@</span><br><span> {</span><br><span> const struct sockaddr_in *sin = (const struct sockaddr_in *)sa;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (port)</span><br><span style="color: hsl(0, 100%, 40%);">- *port = ntohs(sin->sin_port);</span><br><span style="color: hsl(0, 100%, 40%);">- if (addr)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_sockaddrin_to_str_and_uint(addr, addr_len, port, sin);</span><br><span> }</span><br><span> </span><br><span> /*! Initialize a unix domain socket (including bind/connect)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11842">change 11842</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/11842"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 </div>
<div style="display:none"> Gerrit-Change-Number: 11842 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>