<p>Holger Freyther would like Vadim Yanitskiy, Pau Espin Pedrol, Max and Jenkins Builder to <strong>review</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12208">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "mobile: use VTY bind addr from config, deprecate cmd line options"<br><br>--vty-port=0 is a desirable "feature" and used by the ms_driver of the<br>osmo-gsm-tester. It let's the kernel pick a free port for the application<br>and by printing it on stdout one can still discover it. It allows to start<br>many "mobile" without having to worry about IP address assignment<br>(e.g. 127.0.0.23, 127.0.0.24).<br><br>I don't think there is a way to configure the port right now. This change<br>should be submitted once vty.c has a option to specify the address and<br>optionally the port.<br><br>This reverts commit da96b3c0aed7a63772faee91b7056dd0b3d72890.<br><br>Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8<br>---<br>M src/host/layer23/include/osmocom/bb/mobile/app_mobile.h<br>M src/host/layer23/src/mobile/app_mobile.c<br>M src/host/layer23/src/mobile/main.c<br>3 files changed, 20 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/12208/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h</span><br><span>index 191f4ba..c2ab3c8 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h</span><br><span>@@ -9,7 +9,7 @@</span><br><span> struct vty;</span><br><span> </span><br><span> int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *),</span><br><span style="color: hsl(0, 100%, 40%);">- const char *config_file);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *config_file, const char *vty_ip, uint16_t vty_port);</span><br><span> int l23_app_exit(void);</span><br><span> int l23_app_work(int *quit);</span><br><span> int mobile_delete(struct osmocom_ms *ms, int force);</span><br><span>diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c</span><br><span>index a051fba..464cd55 100644</span><br><span>--- a/src/host/layer23/src/mobile/app_mobile.c</span><br><span>+++ b/src/host/layer23/src/mobile/app_mobile.c</span><br><span>@@ -39,8 +39,6 @@</span><br><span> #include <osmocom/bb/mobile/voice.h></span><br><span> #include <osmocom/bb/mobile/primitives.h></span><br><span> #include <osmocom/bb/common/sap_interface.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/vty/ports.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/telnet_interface.h></span><br><span> </span><br><span>@@ -436,7 +434,7 @@</span><br><span> </span><br><span> /* global init */</span><br><span> int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *),</span><br><span style="color: hsl(0, 100%, 40%);">- const char *config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *config_file, const char *vty_ip, uint16_t vty_port)</span><br><span> {</span><br><span> struct telnet_connection dummy_conn;</span><br><span> int rc = 0;</span><br><span>@@ -464,11 +462,10 @@</span><br><span> LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file);</span><br><span> }</span><br><span> vty_reading = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = telnet_init_dynif(l23_ctx, NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- vty_get_bind_addr(), OSMO_VTY_PORT_BB);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(l23_ctx, NULL, vty_ip, vty_port);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_ip, vty_port, strerror(errno));</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c</span><br><span>index 9764b33..e015c30 100644</span><br><span>--- a/src/host/layer23/src/mobile/main.c</span><br><span>+++ b/src/host/layer23/src/mobile/main.c</span><br><span>@@ -51,6 +51,8 @@</span><br><span> static char *gsmtap_ip = 0;</span><br><span> static const char *custom_cfg_file = NULL;</span><br><span> struct gsmtap_inst *gsmtap_inst = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static char *vty_ip = "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned short vty_port = 4247;</span><br><span> char *config_dir = NULL;</span><br><span> int use_mncc_sock = 0;</span><br><span> int daemonize = 0;</span><br><span>@@ -85,6 +87,10 @@</span><br><span> printf(" Some help...\n");</span><br><span> printf(" -h --help this text\n");</span><br><span> printf(" -i --gsmtap-ip The destination IP used for GSMTAP.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -u --vty-ip The VTY IP to telnet to. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(default %s)\n", vty_ip);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -v --vty-port The VTY port number to telnet to. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(default %u)\n", vty_port);</span><br><span> printf(" -d --debug Change debug flags. default: %s\n",</span><br><span> debug_default);</span><br><span> printf(" -D --daemonize Run as daemon\n");</span><br><span>@@ -100,13 +106,12 @@</span><br><span> static struct option long_options[] = {</span><br><span> {"help", 0, 0, 'h'},</span><br><span> {"gsmtap-ip", 1, 0, 'i'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"vty-ip", 1, 0, 'u'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"vty-port", 1, 0, 'v'},</span><br><span> {"debug", 1, 0, 'd'},</span><br><span> {"daemonize", 0, 0, 'D'},</span><br><span> {"config-file", 1, 0, 'c'},</span><br><span> {"mncc-sock", 0, 0, 'm'},</span><br><span style="color: hsl(0, 100%, 40%);">- /* DEPRECATED options, to be removed */</span><br><span style="color: hsl(0, 100%, 40%);">- {"vty-ip", 1, 0, 'u'},</span><br><span style="color: hsl(0, 100%, 40%);">- {"vty-port", 1, 0, 'v'},</span><br><span> {0, 0, 0, 0},</span><br><span> };</span><br><span> </span><br><span>@@ -124,9 +129,15 @@</span><br><span> case 'i':</span><br><span> gsmtap_ip = optarg;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'u':</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_ip = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'c':</span><br><span> custom_cfg_file = optarg;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'v':</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_port = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'd':</span><br><span> log_parse_category_mask(osmo_stderr_target, optarg);</span><br><span> break;</span><br><span>@@ -136,13 +147,6 @@</span><br><span> case 'm':</span><br><span> use_mncc_sock = 1;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- /* DEPRECATED options, to be removed */</span><br><span style="color: hsl(0, 100%, 40%);">- case 'u':</span><br><span style="color: hsl(0, 100%, 40%);">- case 'v':</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Both 'u' and 'v' options are "</span><br><span style="color: hsl(0, 100%, 40%);">- "deprecated! Please use the configuration file "</span><br><span style="color: hsl(0, 100%, 40%);">- "in order to set VTY bind address.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- /* fall-thru */</span><br><span> default:</span><br><span> /* Unknown parameter passed */</span><br><span> return -EINVAL;</span><br><span>@@ -251,9 +255,9 @@</span><br><span> config_dir = dirname(config_dir);</span><br><span> </span><br><span> if (use_mncc_sock)</span><br><span style="color: hsl(0, 100%, 40%);">- rc = l23_app_init(mncc_recv_socket, config_file);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- rc = l23_app_init(NULL, config_file);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = l23_app_init(NULL, config_file, vty_ip, vty_port);</span><br><span> if (rc)</span><br><span> exit(rc);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12208">change 12208</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/12208"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 </div>
<div style="display:none"> Gerrit-Change-Number: 12208 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>