<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/23880">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: call telnet_init_dynif() after config file is read<br><br>In case the config file specifies a vty bind address, we must read<br>it before we start the telnet server.<br><br>Change-Id: I44561754d4beaad5c74cb66994ca4ef38960ea78<br>---<br>M src/osmo_client_main.c<br>M src/osmo_server_main.c<br>2 files changed, 13 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/80/23880/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c</span><br><span>index 0951115..1ab24c3 100644</span><br><span>--- a/src/osmo_client_main.c</span><br><span>+++ b/src/osmo_client_main.c</span><br><span>@@ -259,12 +259,6 @@</span><br><span> </span><br><span>       osmo_tls_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    rc = telnet_init_dynif(tall_cli_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_PCAP_CLIENT);</span><br><span style="color: hsl(0, 100%, 40%);">-     if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n");</span><br><span style="color: hsl(0, 100%, 40%);">-               exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">-        }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    pcap_client = osmo_pcap_client_alloc(tall_cli_ctx);</span><br><span>  if (!pcap_client) {</span><br><span>          LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate osmo_pcap_client.\n");</span><br><span>@@ -289,6 +283,13 @@</span><br><span>                exit(1);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(tall_cli_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_PCAP_CLIENT);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n");</span><br><span style="color: hsl(120, 100%, 40%);">+             exit(1);</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>        /* attempt to connect to the remote */</span><br><span>       if (pcap_client->conn.srv_ip && pcap_client->conn.srv_port > 0)</span><br><span>             osmo_client_connect(&pcap_client->conn);</span><br><span>diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c</span><br><span>index b5f573c..f198b58 100644</span><br><span>--- a/src/osmo_server_main.c</span><br><span>+++ b/src/osmo_server_main.c</span><br><span>@@ -271,12 +271,6 @@</span><br><span> </span><br><span>      osmo_tls_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    rc = telnet_init_dynif(tall_srv_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_PCAP_SERVER);</span><br><span style="color: hsl(0, 100%, 40%);">-     if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n");</span><br><span style="color: hsl(0, 100%, 40%);">-               exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">-        }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    pcap_server = talloc_zero(tall_srv_ctx, struct osmo_pcap_server);</span><br><span>    if (!pcap_server) {</span><br><span>          LOGP(DSERVER, LOGL_ERROR, "Failed to allocate osmo_pcap_server.\n");</span><br><span>@@ -299,6 +293,12 @@</span><br><span>                exit(1);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(tall_srv_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_PCAP_SERVER);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n");</span><br><span style="color: hsl(120, 100%, 40%);">+             exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  osmo_tls_server_init(pcap_server);</span><br><span> </span><br><span>       /* attempt to connect to the remote */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/23880">change 23880</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/osmo-pcap/+/23880"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I44561754d4beaad5c74cb66994ca4ef38960ea78 </div>
<div style="display:none"> Gerrit-Change-Number: 23880 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>