<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11472">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Max: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon: make TRX bind address configurable<br><br>Previously the wildcard address (i.e. '0.0.0.0') was hard-coded<br>as the bind address of TRX interface. Let's make it configurable<br>by introducing a command line option.<br><br>Note that the '--trx-ip' option was deprecated by '--trx-remote',<br>because it isn't clean whether it is remore or local address. It<br>still can be used, but was removed from help message.<br><br>Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95<br>---<br>M src/host/trxcon/trxcon.c<br>1 file changed, 17 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c</span><br><span>index 84d132e..251321d 100644</span><br><span>--- a/src/host/trxcon/trxcon.c</span><br><span>+++ b/src/host/trxcon/trxcon.c</span><br><span>@@ -68,7 +68,8 @@</span><br><span> </span><br><span> /* TRX specific */</span><br><span> struct trx_instance *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *trx_ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *trx_bind_ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *trx_remote_ip;</span><br><span> uint16_t trx_base_port;</span><br><span> uint32_t trx_fn_advance;</span><br><span> } app_data;</span><br><span>@@ -152,7 +153,8 @@</span><br><span> printf(" Some help...\n");</span><br><span> printf(" -h --help this text\n");</span><br><span> printf(" -d --debug Change debug flags. Default: %s\n", DEBUG_DEFAULT);</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" -i --trx-ip IP address of host runing TRX (default 127.0.0.1)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -b --trx-bind TRX bind IP address (default 0.0.0.0)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -i --trx-remote TRX remote IP address (default 127.0.0.1)\n");</span><br><span> printf(" -p --trx-port Base port of TRX instance (default 6700)\n");</span><br><span> printf(" -f --trx-advance Scheduler clock advance (default 20)\n");</span><br><span> printf(" -s --socket Listening socket for layer23 (default /tmp/osmocom_l2)\n");</span><br><span>@@ -167,14 +169,18 @@</span><br><span> {"help", 0, 0, 'h'},</span><br><span> {"debug", 1, 0, 'd'},</span><br><span> {"socket", 1, 0, 's'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"trx-bind", 1, 0, 'b'},</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOTE: 'trx-ip' is now an alias for 'trx-remote'</span><br><span style="color: hsl(120, 100%, 40%);">+ * due to backward compatibility reasons! */</span><br><span> {"trx-ip", 1, 0, 'i'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"trx-remote", 1, 0, 'i'},</span><br><span> {"trx-port", 1, 0, 'p'},</span><br><span> {"trx-advance", 1, 0, 'f'},</span><br><span> {"daemonize", 0, 0, 'D'},</span><br><span> {0, 0, 0, 0}</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "d:i:p:f:s:Dh",</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "d:b:i:p:f:s:Dh",</span><br><span> long_options, &option_index);</span><br><span> if (c == -1)</span><br><span> break;</span><br><span>@@ -188,8 +194,11 @@</span><br><span> case 'd':</span><br><span> app_data.debug_mask = optarg;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'b':</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.trx_bind_ip = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'i':</span><br><span style="color: hsl(0, 100%, 40%);">- app_data.trx_ip = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.trx_remote_ip = optarg;</span><br><span> break;</span><br><span> case 'p':</span><br><span> app_data.trx_base_port = atoi(optarg);</span><br><span>@@ -212,7 +221,8 @@</span><br><span> static void init_defaults(void)</span><br><span> {</span><br><span> app_data.bind_socket = "/tmp/osmocom_l2";</span><br><span style="color: hsl(0, 100%, 40%);">- app_data.trx_ip = "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.trx_remote_ip = "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.trx_bind_ip = "0.0.0.0";</span><br><span> app_data.trx_base_port = 6700;</span><br><span> app_data.trx_fn_advance = 20;</span><br><span> </span><br><span>@@ -274,7 +284,8 @@</span><br><span> goto exit;</span><br><span> </span><br><span> /* Init transceiver interface */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = trx_if_open(&app_data.trx, "0.0.0.0", app_data.trx_ip, app_data.trx_base_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_if_open(&app_data.trx,</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port);</span><br><span> if (rc)</span><br><span> goto exit;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11472">change 11472</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/11472"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 </div>
<div style="display:none"> Gerrit-Change-Number: 11472 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>