<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11455">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add osmo_sock_get_{local,remote}_ip{,_port}()<br><br>Return only the IP or port of either the local or remote connection,<br>not the whole set of IP and port of both the local and remote<br>connection like osmo_sock_get_name() does it. This is needed for<br>OS#2841, where we only want to print the remote IP.<br><br>Related: OS#2841<br>Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1<br>---<br>M include/osmocom/core/socket.h<br>M src/socket.c<br>2 files changed, 92 insertions(+), 25 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 f23a243..28f89a5 100644</span><br><span>--- a/include/osmocom/core/socket.h</span><br><span>+++ b/include/osmocom/core/socket.h</span><br><span>@@ -9,6 +9,7 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> #include <stdbool.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stddef.h></span><br><span> </span><br><span> struct sockaddr;</span><br><span> struct osmo_fd;</span><br><span>@@ -56,6 +57,11 @@</span><br><span> const char *socket_path, unsigned int flags);</span><br><span> </span><br><span> char *osmo_sock_get_name(void *ctx, int fd);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_local_ip(int fd, char *host, size_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_local_ip_port(int fd, char *port, size_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_remote_ip(int fd, char *host, size_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_remote_ip_port(int fd, char *port, size_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> int osmo_sock_mcast_loop_set(int fd, bool enable);</span><br><span> int osmo_sock_mcast_ttl_set(int fd, uint8_t ttl);</span><br><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index bb5505f..c7e1c9d 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -682,6 +682,86 @@</span><br><span> return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Get the IP and/or port number on socket. This is for internal usage.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Convenience wrappers: osmo_sock_get_local_ip(),</span><br><span style="color: hsl(120, 100%, 40%);">+ * osmo_sock_get_local_ip_port(), osmo_sock_get_remote_ip(),</span><br><span style="color: hsl(120, 100%, 40%);">+ * osmo_sock_get_remote_ip_port() and osmo_sock_get_name()</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fd file descriptor of socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] ip IP address (will be filled in when not NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ip_len length of the ip buffer</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] port number (will be filled in when not NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] port_len length of the port buffer</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] local (true) or remote (false) name will get looked at</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success; negative otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_sock_get_name2(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr sa;</span><br><span style="color: hsl(120, 100%, 40%);">+ socklen_t len = sizeof(sa);</span><br><span style="color: hsl(120, 100%, 40%);">+ char ipbuf[64], portbuf[16];</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = getnameinfo(&sa, len, ipbuf, sizeof(ipbuf),</span><br><span style="color: hsl(120, 100%, 40%);">+ portbuf, sizeof(portbuf),</span><br><span style="color: hsl(120, 100%, 40%);">+ NI_NUMERICHOST | NI_NUMERICSERV);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ strncpy(ip, ipbuf, ip_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (port)</span><br><span style="color: hsl(120, 100%, 40%);">+ strncpy(port, portbuf, port_len);</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 style="color: hsl(120, 100%, 40%);">+/*! Get local IP address on socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fd file descriptor of socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] ip IP address (will be filled in)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] len length of the output buffer</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success; negative otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_local_ip(int fd, char *ip, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_sock_get_name2(fd, ip, len, NULL, 0, true);</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%);">+/*! Get local port on socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fd file descriptor of socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] port number (will be filled in)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] len length of the output buffer</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success; negative otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_local_ip_port(int fd, char *port, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_sock_get_name2(fd, NULL, 0, port, len, true);</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%);">+/*! Get remote IP address on socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fd file descriptor of socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] ip IP address (will be filled in)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] len length of the output buffer</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success; negative otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_remote_ip(int fd, char *ip, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_sock_get_name2(fd, ip, len, NULL, 0, false);</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%);">+/*! Get remote port on socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fd file descriptor of socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] port number (will be filled in)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] len length of the output buffer</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success; negative otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sock_get_remote_ip_port(int fd, char *port, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_sock_get_name2(fd, NULL, 0, port, len, false);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Get address/port information on socket in dyn-alloc string</span><br><span> * \param[in] ctx talloc context from which to allocate string buffer</span><br><span> * \param[in] fd file descriptor of socket</span><br><span>@@ -689,37 +769,18 @@</span><br><span> */</span><br><span> char *osmo_sock_get_name(void *ctx, int fd)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr sa_l, sa_r;</span><br><span style="color: hsl(0, 100%, 40%);">- socklen_t sa_len_l = sizeof(sa_l);</span><br><span style="color: hsl(0, 100%, 40%);">- socklen_t sa_len_r = sizeof(sa_r);</span><br><span> char hostbuf_l[64], hostbuf_r[64];</span><br><span> char portbuf_l[16], portbuf_r[16];</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = getsockname(fd, &sa_l, &sa_len_l);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* get local */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sock_get_name2(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true))</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = getnameinfo(&sa_l, sa_len_l, hostbuf_l, sizeof(hostbuf_l),</span><br><span style="color: hsl(0, 100%, 40%);">- portbuf_l, sizeof(portbuf_l),</span><br><span style="color: hsl(0, 100%, 40%);">- NI_NUMERICHOST | NI_NUMERICSERV);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* get remote */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_sock_get_name2(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false))</span><br><span style="color: hsl(120, 100%, 40%);">+ return talloc_asprintf(ctx, "(r=%s:%s<->l=%s:%s)", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = getpeername(fd, &sa_r, &sa_len_r);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto local_only;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = getnameinfo(&sa_r, sa_len_r, hostbuf_r, sizeof(hostbuf_r),</span><br><span style="color: hsl(0, 100%, 40%);">- portbuf_r, sizeof(portbuf_r),</span><br><span style="color: hsl(0, 100%, 40%);">- NI_NUMERICHOST | NI_NUMERICSERV);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto local_only;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return talloc_asprintf(ctx, "(r=%s:%s<->l=%s:%s)", hostbuf_r, portbuf_r,</span><br><span style="color: hsl(0, 100%, 40%);">- hostbuf_l, portbuf_l);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-local_only:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* local only: different format */</span><br><span> return talloc_asprintf(ctx, "(r=NULL<->l=%s:%s)", hostbuf_l, portbuf_l);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11455">change 11455</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/11455"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 </div>
<div style="display:none"> Gerrit-Change-Number: 11455 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Max <msuraev@sysmocom.de> </div>