<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11455">View Change</a></p><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, 35 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/55/11455/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 f23a243..6f3de0f 100644</span><br><span>--- a/include/osmocom/core/socket.h</span><br><span>+++ b/include/osmocom/core/socket.h</span><br><span>@@ -56,6 +56,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%);">+char *osmo_sock_get_name2(void *ctx, int fd, bool local, bool port);</span><br><span style="color: hsl(120, 100%, 40%);">+#define osmo_sock_get_local_ip(ctx, fd) osmo_sock_get_name2(ctx, fd, false, false)</span><br><span style="color: hsl(120, 100%, 40%);">+#define osmo_sock_get_local_ip_port(ctx, fd) osmo_sock_get_name2(ctx, fd, false, true)</span><br><span style="color: hsl(120, 100%, 40%);">+#define osmo_sock_get_remote_ip(ctx, fd) osmo_sock_get_name2(ctx, fd, true, false)</span><br><span style="color: hsl(120, 100%, 40%);">+#define osmo_sock_get_remote_ip_port(ctx, fd) osmo_sock_get_name2(ctx, fd, true, true)</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..dedf2b6 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -682,6 +682,36 @@</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 one IP or port number on socket in dyn-alloc string. This is</span><br><span style="color: hsl(120, 100%, 40%);">+ * for internal usage. 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() and</span><br><span style="color: hsl(120, 100%, 40%);">+ * osmo_sock_get_remote_ip_port().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx talloc context from which to allocate string buffer</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[in] local (true) or remote (false) name will get looked at</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] port (true) or ip address (false) will be returned</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns string with IP or port</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_sock_get_name2(void *ctx, int fd, bool local, bool port)</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 hostbuf[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 NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = getnameinfo(&sa, len, hostbuf, sizeof(hostbuf),</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 NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return talloc_strdup(ctx, port ? portbuf : hostbuf);</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></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: newchange </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: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>