<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/14972">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty/telnet_interface.c: log connection accept() / close() events<br><br>Unfortunately, osmo_sock_get_name_buf() fails in telnet_close_client():<br><br> DLGLOBAL INFO telnet_interface.c:130 Closing telnet connection <error-in-getsockname><br><br>because getsockname(), getpeername(), and even close() fail with:<br><br> "Bad file descriptor".<br><br>This looks like a bug of the existing code.<br><br>Change-Id: I77b31abfa159d2f269deaa5a08d94b7bbba7d23c<br>---<br>M src/vty/telnet_interface.c<br>1 file changed, 12 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c</span><br><span>index d44754c..9aa36fe 100644</span><br><span>--- a/src/vty/telnet_interface.c</span><br><span>+++ b/src/vty/telnet_interface.c</span><br><span>@@ -123,6 +123,13 @@</span><br><span> int telnet_close_client(struct osmo_fd *fd)</span><br><span> {</span><br><span> struct telnet_connection *conn = (struct telnet_connection*)fd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ char sock_name_buf[OSMO_SOCK_NAME_MAXLEN];</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%);">+ /* FIXME: getsockname() always fails: "Bad file descriptor" */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_get_name_buf(sock_name_buf, OSMO_SOCK_NAME_MAXLEN, fd->fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_INFO, "Closing telnet connection %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (rc <= 0) ? "r=NULL<->l=NULL" : sock_name_buf);</span><br><span> </span><br><span> close(fd->fd);</span><br><span> osmo_fd_unregister(fd);</span><br><span>@@ -166,6 +173,7 @@</span><br><span> struct sockaddr_in sockaddr;</span><br><span> socklen_t len = sizeof(sockaddr);</span><br><span> int new_connection = accept(fd->fd, (struct sockaddr*)&sockaddr, &len);</span><br><span style="color: hsl(120, 100%, 40%);">+ char sock_name_buf[OSMO_SOCK_NAME_MAXLEN];</span><br><span> int rc;</span><br><span> </span><br><span> if (new_connection < 0) {</span><br><span>@@ -173,6 +181,10 @@</span><br><span> return new_connection;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_get_name_buf(sock_name_buf, OSMO_SOCK_NAME_MAXLEN, new_connection);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_INFO, "Accept()ed new telnet connection %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (rc <= 0) ? "r=NULL<->l=NULL" : sock_name_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> connection = talloc_zero(tall_telnet_ctx, struct telnet_connection);</span><br><span> connection->priv = fd->data;</span><br><span> connection->fd.data = connection;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/14972">change 14972</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/+/14972"/><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: I77b31abfa159d2f269deaa5a08d94b7bbba7d23c </div>
<div style="display:none"> Gerrit-Change-Number: 14972 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </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>