<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20484">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: add a command to show GPRS related info<br><br>Here is a sample output:<br><br> OsmoBTS# show bts 0 gprs<br> BTS 0, RAC 0, NSEI 101, BVCI 2<br> Cell NM state: Oper 'Enabled', Admin 'Unlocked', Avail 'OK'<br> NSE NM state: Oper 'Enabled', Admin 'Unlocked', Avail 'OK'<br> NSVC0 (NSVCI 101) NM state: Oper 'Enabled', Admin 'Unlocked', Avail 'OK'<br> Address: r=127.0.0.1:23010<->l=0.0.0.0:55385<br> NSVC1 (NSVCI 0) NM state: Oper 'Disabled', Admin 'Locked', Avail 'Off line'<br><br>This command is useful for debugging NS connection problems.<br><br>Change-Id: I149eea0b1c109020406eb67c9082c335a77aab06<br>---<br>M src/common/vty.c<br>1 file changed, 70 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 326e332..1c3b496 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -39,6 +39,7 @@</span><br><span> #include <osmocom/vty/ports.h></span><br><span> #include <osmocom/core/gsmtap.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span> #include <osmocom/trau/osmo_ortp.h></span><br><span> </span><br><span> </span><br><span>@@ -1104,6 +1105,73 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void gprs_dump_vty(struct vty *vty, const struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* GPRS parameters received from the BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "BTS %u, RAC %u, NSEI %u, BVCI %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, bts->gprs.rac,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.nse.nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.cell.bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " Cell NM state: ");</span><br><span style="color: hsl(120, 100%, 40%);">+ net_dump_nmstate(vty, &bts->gprs.cell.mo.nm_state);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " NSE NM state: ");</span><br><span style="color: hsl(120, 100%, 40%);">+ net_dump_nmstate(vty, &bts->gprs.nse.mo.nm_state);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_gprs_nsvc *nsvc = &bts->gprs.nsvc[i];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " NSVC%u (NSVCI %u) NM state: ", i, nsvc->nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ net_dump_nmstate(vty, &nsvc->mo.nm_state);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->mo.nm_state.operational == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str remote;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str local;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_sockaddr(&remote, &nsvc->remote.u.sas) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote = (struct osmo_sockaddr_str) { .ip = "<INVALID>" };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_sockaddr(&local, &nsvc->local.u.sas) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ local = (struct osmo_sockaddr_str) { .ip = "<INVALID>" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Work around for over-defensiveness of OSMO_SOCKADDR_STR_FMT_ARGS():</span><br><span style="color: hsl(120, 100%, 40%);">+ * error: the address of ‘remote’ will always evaluate as ‘true’</span><br><span style="color: hsl(120, 100%, 40%);">+ * error: the address of ‘local’ will always evaluate as ‘true’ */</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *r = &remote;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *l = &local;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Getting remote/local address info has never been so easy, right? */</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " Address: r=" OSMO_SOCKADDR_STR_FMT</span><br><span style="color: hsl(120, 100%, 40%);">+ "<->l=" OSMO_SOCKADDR_STR_FMT "%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(r),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCKADDR_STR_FMT_ARGS(l),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_bts_gprs, show_bts_gprs_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show bts <0-255> gprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Display information about a BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_NR_STR "GPRS/EGPRS configuration\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_network *net = gsmnet_from_vty(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = gsm_bts_num(net, atoi(argv[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% can't find BTS '%s'%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ argv[0], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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: also print info about PCUIF connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_dump_vty(vty, bts);</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(test_send_failure_event_report, test_send_failure_event_report_cmd, "test send-failure-event-report <0-255>",</span><br><span> "Various testing commands\n"</span><br><span> "Send a test OML failure event report to the BSC\n" BTS_NR_STR)</span><br><span>@@ -2032,6 +2100,8 @@</span><br><span> install_element_ve(&show_ts_cmd);</span><br><span> install_element_ve(&show_lchan_cmd);</span><br><span> install_element_ve(&show_lchan_summary_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_bts_gprs_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_element_ve(&logging_fltr_l1_sapi_cmd);</span><br><span> install_element_ve(&no_logging_fltr_l1_sapi_cmd);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20484">change 20484</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/+/20484"/><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: I149eea0b1c109020406eb67c9082c335a77aab06 </div>
<div style="display:none"> Gerrit-Change-Number: 20484 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>