<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19833">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbsp_link.c: disable server with listen_port = 0, not -1<br><br>smscb.h defines listen_port as "0 for disabling local server", so rather<br>conform to that. That also allows using uint16_t for port numbers.<br><br>Change-Id: Ibe743fb17f0bde22004932076d45a6ba929ac565<br>---<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/cbsp_link.c<br>2 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/19833/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index 22eba50..4dfe868 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -131,8 +131,8 @@</span><br><span> net->cbc->net = net;</span><br><span> /* no cbc_hostname: client not started by default */</span><br><span> net->cbc->config.cbc_port = CBSP_TCP_PORT;</span><br><span style="color: hsl(0, 100%, 40%);">- /* listen_port == -1: server not started by default */</span><br><span style="color: hsl(0, 100%, 40%);">- net->cbc->config.listen_port = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* listen_port == 0: server not started by default */</span><br><span style="color: hsl(120, 100%, 40%);">+ net->cbc->config.listen_port = 0;</span><br><span> net->cbc->config.listen_hostname = talloc_strdup(net->cbc, "127.0.0.1");</span><br><span> </span><br><span> return net;</span><br><span>diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c</span><br><span>index 6a0884e..bf9d853 100644</span><br><span>--- a/src/osmo-bsc/cbsp_link.c</span><br><span>+++ b/src/osmo-bsc/cbsp_link.c</span><br><span>@@ -203,7 +203,7 @@</span><br><span> }</span><br><span> </span><br><span> /* shut down server, if no longer configured */</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbc->config.listen_port == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cbc->config.listen_port) {</span><br><span> if (cbc->server.srv || cbc->server.link)</span><br><span> LOGP(DCBS, LOGL_NOTICE, "Stopping CBSP server\n");</span><br><span> if (cbc->server.srv) {</span><br><span>@@ -236,7 +236,7 @@</span><br><span> }</span><br><span> </span><br><span> /* start server, if configured */</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbc->config.listen_port != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cbc->config.listen_port > 0) {</span><br><span> LOGP(DCBS, LOGL_NOTICE, "Starting CBSP Server (bound to %s:%u)\n",</span><br><span> cbc->config.listen_hostname, cbc->config.listen_port);</span><br><span> if (!cbc->server.link) {</span><br><span>@@ -347,7 +347,7 @@</span><br><span> NO_STR "Remove CBSP Listen Port; disables inbound CBSP connections\n")</span><br><span> {</span><br><span> struct bsc_cbc_link *cbc = vty_cbc_data(vty);</span><br><span style="color: hsl(0, 100%, 40%);">- cbc->config.listen_port = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ cbc->config.listen_port = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -402,7 +402,7 @@</span><br><span> vty_out(vty, "CBSP Client Connection: %s%s",</span><br><span> cbc->client.sock_name ? cbc->client.sock_name : "Disconnected", VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbc->config.listen_port < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cbc->config.listen_port)</span><br><span> vty_out(vty, "CBSP Server Config: Disabled%s\n", VTY_NEWLINE);</span><br><span> else {</span><br><span> vty_out(vty, "CBSP Server Config: Listen IP=%s, Port=%u%s\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19833">change 19833</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-bsc/+/19833"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ibe743fb17f0bde22004932076d45a6ba929ac565 </div>
<div style="display:none"> Gerrit-Change-Number: 19833 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>