<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/10808">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSMTAP: make remote host for Um logging configurable via VTY<br><br>So far, the only way to configure GSMTAP Um logging is to use the<br>cmdline argument '-i'. Let's deprecate it, and add a VTY command<br>to allow setting the remote host from configuration file.<br><br>The legacy '-i' option, if provided, overrides the configuration<br>file option, and will also appear in 'write file'.<br><br>Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1<br>Tweaked by: Vadim Yanitskiy <vyanitskiy@sysmocom.de><br>---<br>M include/osmo-bts/bts.h<br>M src/common/main.c<br>M src/common/vty.c<br>3 files changed, 69 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index 3adafcc..be0222d 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -346,6 +346,7 @@</span><br><span> /* GSMTAP Um logging (disabled by default) */</span><br><span> struct {</span><br><span> struct gsmtap_inst *inst;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *remote_host;</span><br><span> uint32_t sapi_mask;</span><br><span> uint8_t sapi_acch;</span><br><span> } gsmtap;</span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 38f517c..2503352 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -77,7 +77,6 @@</span><br><span> " -T --timestamp Prefix every log line with a timestamp\n"</span><br><span> " -V --version Print version information and exit\n"</span><br><span> " -e --log-level Set a global log-level\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -i --gsmtap-ip The destination IP used for GSMTAP.\n"</span><br><span> "\nVTY reference generation:\n"</span><br><span> " --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"</span><br><span> " --vty-ref-xml Generate the VTY reference XML output and exit.\n"</span><br><span>@@ -186,6 +185,8 @@</span><br><span> break;</span><br><span> case 'i':</span><br><span> gsmtap_ip = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Command line argument '-i' is deprecated, use VTY "</span><br><span style="color: hsl(120, 100%, 40%);">+ "parameter 'gsmtap-remote-host %s' instead.\n", gsmtap_ip);</span><br><span> break;</span><br><span> case 't':</span><br><span> fprintf(stderr, "Command line argument '-t' is deprecated and does nothing, "</span><br><span>@@ -320,15 +321,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%);">- g_bts->gsmtap.inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_bts->gsmtap.inst == NULL) {</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(g_bts->gsmtap.inst);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (bts_init(g_bts) < 0) {</span><br><span> fprintf(stderr, "unable to open bts\n");</span><br><span> exit(1);</span><br><span>@@ -358,6 +350,32 @@</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 host from VTY config, but a commandline option overrides that. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmtap_ip != NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_bts->gsmtap.remote_host != NULL) {</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 %s' overrides "</span><br><span style="color: hsl(120, 100%, 40%);">+ "'gsmtap-remote-host %s' from the config file\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_ip, g_bts->gsmtap.remote_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(g_bts->gsmtap.remote_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->gsmtap.remote_host = talloc_strdup(g_bts, gsmtap_ip);</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%);">+ /* TODO: move this to gsm_bts_alloc() */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_bts->gsmtap.remote_host != NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Setting up GSMTAP Um forwarding to '%s:%u'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->gsmtap.remote_host, GSMTAP_UDP_PORT);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->gsmtap.inst = gsmtap_source_init(g_bts->gsmtap.remote_host,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSMTAP_UDP_PORT, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_bts->gsmtap.inst == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Failed during gsmtap_source_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(g_bts->gsmtap.inst);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bts_controlif_setup(g_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 d60a2be..bbd33f8 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -315,6 +315,10 @@</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.remote_host != NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gsmtap-remote-host %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.remote_host,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> for (i = 0; i < sizeof(uint32_t) * 8; i++) {</span><br><span> if (bts->gsmtap.sapi_mask & ((uint32_t) 1 << i)) {</span><br><span> sapi_buf = get_value_string_or_null(gsmtap_sapi_names, i);</span><br><span>@@ -1826,6 +1830,40 @@</span><br><span> "logical channel commands\n" \</span><br><span> "logical channel number\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bts_gsmtap_remote_host,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_gsmtap_remote_host_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "gsmtap-remote-host [HOSTNAME]",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable GSMTAP Um logging (see also 'gsmtap-sapi')\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Remote IP address or hostname ('localhost' if omitted)\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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(bts, &bts->gsmtap.remote_host,</span><br><span style="color: hsl(120, 100%, 40%);">+ argc > 0 ? argv[0] : "localhost");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->type != VTY_FILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This command requires restart%s", 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_bts_no_gsmtap_remote_host,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_no_gsmtap_remote_host_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no gsmtap-remote-host",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable GSMTAP Um logging\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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap.remote_host != NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(bts->gsmtap.remote_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.remote_host = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->type != VTY_FILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This command requires restart%s", 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> DEFUN(cfg_bts_gsmtap_sapi_all, cfg_bts_gsmtap_sapi_all_cmd,</span><br><span> "gsmtap-sapi (enable-all|disable-all)",</span><br><span> "Enable/disable sending of UL/DL messages over GSMTAP\n"</span><br><span>@@ -2237,6 +2275,8 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_smscb_tgt_qlen_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_smscb_qhyst_cmd);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_gsmtap_remote_host_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_no_gsmtap_remote_host_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_all_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_no_gsmtap_sapi_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/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/c/osmo-bts/+/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-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 </div>
<div style="display:none"> Gerrit-Change-Number: 10808 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>