<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-cbc/+/22401">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make CBSP local bind IP+port VTY-configurable<br><br>Change-Id: I9ba3f4cf129d6df4468defc92697f1df62348719<br>---<br>M doc/manuals/chapters/configuration.adoc<br>M src/cbc_data.h<br>M src/cbc_main.c<br>M src/cbc_vty.c<br>4 files changed, 74 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/01/22401/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc</span><br><span>index 31a5370..c205d91 100644</span><br><span>--- a/doc/manuals/chapters/configuration.adoc</span><br><span>+++ b/doc/manuals/chapters/configuration.adoc</span><br><span>@@ -45,3 +45,18 @@</span><br><span> ----</span><br><span> </span><br><span> For more details on the available configuration commands, please check the OsmoCBC VTY Reference.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+=== Configuring the IP/Port for CBSP to bind to</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+It can be configure to which IP and TCP port the CBSP protocol binds to.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+The default is to bind to the 3GPP standard port number 48049 for CBSP at the</span><br><span style="color: hsl(120, 100%, 40%);">+loopback IP address 127.0.0.1.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+.Example: Configure CBSP to bind to 127.0.0.1:48049</span><br><span style="color: hsl(120, 100%, 40%);">+----</span><br><span style="color: hsl(120, 100%, 40%);">+cbc</span><br><span style="color: hsl(120, 100%, 40%);">+ cbsp</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ local-port 48049</span><br><span style="color: hsl(120, 100%, 40%);">+----</span><br><span>diff --git a/src/cbc_data.h b/src/cbc_data.h</span><br><span>index 7900fbc..76fdfad 100644</span><br><span>--- a/src/cbc_data.h</span><br><span>+++ b/src/cbc_data.h</span><br><span>@@ -165,6 +165,10 @@</span><br><span> struct cbc {</span><br><span> struct {</span><br><span> bool permit_unknown_peers;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ char *local_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ int local_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ } cbsp;</span><br><span> } config;</span><br><span> </span><br><span> struct llist_head messages; /* cbc_message.list */</span><br><span>diff --git a/src/cbc_main.c b/src/cbc_main.c</span><br><span>index 06969e7..168fd7d 100644</span><br><span>--- a/src/cbc_main.c</span><br><span>+++ b/src/cbc_main.c</span><br><span>@@ -219,6 +219,8 @@</span><br><span> INIT_LLIST_HEAD(&g_cbc->peers);</span><br><span> INIT_LLIST_HEAD(&g_cbc->messages);</span><br><span> INIT_LLIST_HEAD(&g_cbc->expired_messages);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cbc->config.cbsp.local_host = talloc_strdup(g_cbc, "127.0.0.1");</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cbc->config.cbsp.local_port = CBSP_TCP_PORT;</span><br><span> </span><br><span> cbc_vty_init();</span><br><span> </span><br><span>@@ -240,7 +242,8 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cbsp_cbc_create(tall_cbc_ctx, NULL, -1, &cbc_client_rx_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ cbsp_cbc_create(tall_cbc_ctx, g_cbc->config.cbsp.local_host, g_cbc->config.cbsp.local_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ &cbc_client_rx_cb);</span><br><span> </span><br><span> rest_api_init(tall_rest_ctx, 12345);</span><br><span> </span><br><span>diff --git a/src/cbc_vty.c b/src/cbc_vty.c</span><br><span>index 3466428..b1aa34f 100644</span><br><span>--- a/src/cbc_vty.c</span><br><span>+++ b/src/cbc_vty.c</span><br><span>@@ -267,6 +267,7 @@</span><br><span> enum cbc_vty_node {</span><br><span> CBC_NODE = _LAST_OSMOVTY_NODE + 1,</span><br><span> PEER_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBSP_NODE,</span><br><span> };</span><br><span> </span><br><span> static struct cmd_node cbc_node = {</span><br><span>@@ -310,6 +311,51 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_cbsp, cfg_cbsp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "cbsp",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cell Broadcast Service Protocol\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->node = CBSP_NODE;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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 style="color: hsl(120, 100%, 40%);">+/* CBSP */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct cmd_node cbsp_node = {</span><br><span style="color: hsl(120, 100%, 40%);">+ CBSP_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(config-cbsp)# ",</span><br><span style="color: hsl(120, 100%, 40%);">+ 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%);">+static int config_write_cbsp(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " cbsp%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " local-ip %s%s", g_cbc->config.cbsp.local_host, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " local-port %u%s", g_cbc->config.cbsp.local_port, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+DEFUN(cfg_cbsp_local_ip, cfg_cbsp_local_ip_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "local-ip (A.B.C.D|X:X::X:X)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Local IP address for CBSP\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Local IPv4 address for CBSP\n" "Local IPv6 address for CBSP\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_cbc, &g_cbc->config.cbsp.local_host, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+DEFUN(cfg_cbsp_local_port, cfg_cbsp_local_port_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "local-port <0-65535>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Local TCP port for CBSP\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Local TCP port for CBSP\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cbc->config.cbsp.local_port = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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> /* PEER */</span><br><span> </span><br><span> DEFUN(cfg_cbc_peer, cfg_cbc_peer_cmd,</span><br><span>@@ -418,6 +464,11 @@</span><br><span> install_node(&cbc_node, config_write_cbc);</span><br><span> install_lib_element(CBC_NODE, &cfg_permit_unknown_peers_cmd);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(CBC_NODE, &cfg_cbsp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&cbsp_node, config_write_cbsp);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(CBSP_NODE, &cfg_cbsp_local_ip_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(CBSP_NODE, &cfg_cbsp_local_port_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_lib_element(CBC_NODE, &cfg_cbc_peer_cmd);</span><br><span> install_lib_element(CBC_NODE, &cfg_cbc_no_peer_cmd);</span><br><span> install_node(&peer_node, config_write_peer);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-cbc/+/22401">change 22401</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-cbc/+/22401"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-cbc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9ba3f4cf129d6df4468defc92697f1df62348719 </div>
<div style="display:none"> Gerrit-Change-Number: 22401 </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>