<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11290">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty 'show bts'/'show trx': display IPs and ports<br><br>This quickly allows knowing which IP a BTS is using in order to SSH<br>into it. Example output:<br><br>OsmoBSC> show trx<br>...<br> Baseband Transceiver NM State: Oper 'Enabled', Admin 'Unlocked', Avail 'OK'<br> ip.access stream ID: 0x00<br> (r=192.168.1.178:55416<->l=192.168.1.37:3003)<br>...<br><br>OsmoBSC> show bts<br>...<br> OML Link state: connected 0 days 0 hours 0 min. 43 sec.<br> (r=192.168.1.178:46006<->l=192.168.1.37:3002)<br>...<br><br>Relates: OS#3145<br>Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/11290/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 8e6ff3e..84ae617 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -38,6 +38,7 @@</span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span> #include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/socket.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/abis/e1_input.h></span><br><span> #include <osmocom/bsc/abis_nm.h></span><br><span>@@ -289,6 +290,19 @@</span><br><span> e1l->tei, e1l->sapi, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Dump the IP addresses and ports of the input signal link's timeslot.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This only makes sense for links connected with ipaccess.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Example output: " (r=10.1.42.1:55416<->l=10.1.42.123:3003)" */</span><br><span style="color: hsl(120, 100%, 40%);">+static void e1isl_dump_vty_tcp(struct vty *vty, struct e1inp_sign_link *e1l)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!e1l)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ char *name = osmo_sock_get_name(NULL, e1l->ts->driver.ipaccess.fd.fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s%s", name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(name);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void vty_out_neigh_list(struct vty *vty, struct bitvec *bv)</span><br><span> {</span><br><span> int count = 0;</span><br><span>@@ -451,6 +465,7 @@</span><br><span> vty_out(vty, " %llu days %llu hours %llu min. %llu sec.",</span><br><span> OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec), sec % 60);</span><br><span> vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1isl_dump_vty_tcp(vty, bts->oml_link);</span><br><span> } else {</span><br><span> vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE);</span><br><span> e1isl_dump_vty(vty, bts->oml_link);</span><br><span>@@ -1048,6 +1063,7 @@</span><br><span> if (is_ipaccess_bts(trx->bts)) {</span><br><span> vty_out(vty, " ip.access stream ID: 0x%02x%s",</span><br><span> trx->rsl_tei, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1isl_dump_vty_tcp(vty, trx->rsl_link);</span><br><span> } else {</span><br><span> vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE);</span><br><span> e1isl_dump_vty(vty, trx->rsl_link);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11290">change 11290</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/11290"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f </div>
<div style="display:none"> Gerrit-Change-Number: 11290 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>