<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10808">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add vty config for GSMTAP-SAPI host (-i)<br><br>So far, the only way to configure the target for SAPI GSMTAP is to use the<br>cmdline argument -i. Add a vty command to allow configuring from cfg file.<br><br>Add 'bts 0' / 'gsmtap-host HOSTNAME' and 'no gsmtap-host'.<br><br>The -i option, if provided, overrides the cfg file option.<br><br>In order to set up the SAPI GSMTAP socket after reading the config file, shift<br>the socket init a bit further down in main.c.<br><br>BTW, if the user passed an -i option, the gsmtap host shows up in 'show<br>running-config' and hence will also appear in 'write file'.<br><br>Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/main.c<br>M src/common/vty.c<br>3 files changed, 52 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/10808/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index 794eaea..ef468cb 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -747,6 +747,7 @@</span><br><span> struct osmo_timer_list fn_timer;</span><br><span> } vbts;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ char *gsmtap_sapi_host;</span><br><span> };</span><br><span> </span><br><span> </span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 9121a2a..c08088a 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -275,15 +275,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (gsmtap_ip) {</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gsmtap) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed during gsmtap_init()\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%);">- gsmtap_source_add_sink(gsmtap);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (bts_init(bts) < 0) {</span><br><span> fprintf(stderr, "unable to open bts\n");</span><br><span> exit(1);</span><br><span>@@ -313,6 +304,26 @@</span><br><span> </span><br><span> write_pid_file("osmo-bts");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Accept a GSMTAP-SAPI host from VTY config, but a commandline option overrides that. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmtap_ip) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap_sapi_host) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Command line argument -i overrides 'gsmtap-host' config\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(bts->gsmtap_sapi_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap_sapi_host = talloc_strdup(bts, gsmtap_ip);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap_sapi_host) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_NOTICE, "Setting up GSMTAP SAPI forwarding to %s:%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap_sapi_host, GSMTAP_UDP_PORT);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap = gsmtap_source_init(bts->gsmtap_sapi_host, GSMTAP_UDP_PORT, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gsmtap) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Failed during gsmtap_init()\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%);">+ gsmtap_source_add_sink(gsmtap);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bts_controlif_setup(bts, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_BTS);</span><br><span> </span><br><span> rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(),</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 6061335..98e874f 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -276,6 +276,8 @@</span><br><span> bts->agch_queue.thresh_level, bts->agch_queue.low_level,</span><br><span> bts->agch_queue.high_level, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap_sapi_host)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gsmtap-host %s%s", bts->gsmtap_sapi_host, VTY_NEWLINE);</span><br><span> for (i = 0; i < 32; i++) {</span><br><span> if (gsmtap_sapi_mask & (1 << i)) {</span><br><span> osmo_str2lower(buf_casecnvt, get_value_string(gsmtap_sapi_names, i));</span><br><span>@@ -1392,6 +1394,33 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define GSMTAP_HOST_STR \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the host to send GSMTAP of selected SAPIs to, see gsmtap-sapi and command line option -i." \</span><br><span style="color: hsl(120, 100%, 40%);">+ " (Not related to 'log gsmtap'.)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bts_gsmtap_host, cfg_bts_gsmtap_host_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "gsmtap-host HOSTNAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ GSMTAP_HOST_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Remote IP address or hostname\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap_sapi_host)</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(bts->gsmtap_sapi_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap_sapi_host = talloc_strdup(bts, 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_bts_no_gsmtap_host, cfg_bts_no_gsmtap_host_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no gsmtap-host",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR GSMTAP_HOST_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap_sapi_host)</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(bts->gsmtap_sapi_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap_sapi_host = NULL;</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> static struct cmd_node phy_node = {</span><br><span> PHY_NODE,</span><br><span> "%s(phy)# ",</span><br><span>@@ -1609,6 +1638,8 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_supp_meas_toa256_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_no_supp_meas_toa256_cmd);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_gsmtap_host_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_no_gsmtap_host_cmd);</span><br><span> install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_cmd);</span><br><span> install_element(BTS_NODE, &cfg_trx_no_gsmtap_sapi_cmd);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10808">change 10808</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/10808"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 </div>
<div style="display:none"> Gerrit-Change-Number: 10808 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>