<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9755">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc-nat: Add more complete VTY command to show BSC related info<br><br>Other VTY commands already exist which provides each a subset of these<br>features, but while operating bsc-nat it became interesting to have all<br>this info easily reachable for a specific BSC.<br><br>Change-Id: I47bfd4fb800390505bdeb0f1d0bd1306fb888a59<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c<br>1 file changed, 77 insertions(+), 71 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>index 057d9ab..920c8d7 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>@@ -287,28 +287,6 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(show_bsc_cfg, show_bsc_cfg_cmd, "show bsc config",</span><br><span style="color: hsl(0, 100%, 40%);">- SHOW_STR BSC_STR "Configuration of BSCs\n")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_config *conf;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(conf, &_nat->bsc_configs, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BSC token: '%s' nr: %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- conf->token, conf->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (conf->acc_lst_name)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " access-list: %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- conf->acc_lst_name, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " paging forbidden: %d%s",</span><br><span style="color: hsl(0, 100%, 40%);">- conf->forbid_paging, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (conf->description)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " description: %s%s", conf->description, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " No description.%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void dump_stat_total(struct vty *vty, struct bsc_nat *nat)</span><br><span> {</span><br><span> vty_out(vty, "NAT statistics%s", VTY_NEWLINE);</span><br><span>@@ -324,66 +302,96 @@</span><br><span> osmo_counter_get(nat->stats.bsc.auth_fail), VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_stat_bsc(struct vty *vty, struct bsc_config *conf)</span><br><span style="color: hsl(120, 100%, 40%);">+static void dump_bsc_status(struct vty *vty, struct bsc_config *conf)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int connected = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_connection *con;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " BSC nr: %d%s",</span><br><span style="color: hsl(0, 100%, 40%);">- conf->nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_in sock;</span><br><span style="color: hsl(120, 100%, 40%);">+ socklen_t len = sizeof(sock);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_connection *con_iter, *con = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_lac_entry *lac;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "BSC token: '%s' nr: %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->token, conf->nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conf->acc_lst_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " access-list: %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->acc_lst_name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " paging forbidden: %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->forbid_paging, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conf->description)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " description: %s%s", conf->description, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " No description.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(lac, &conf->lac_list, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " LAC: %d%s", lac->lac, 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%);">+ llist_for_each_entry(con_iter, &_nat->bsc_connections, list_entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (con_iter->cfg == conf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ con = con_iter;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ if (con) {</span><br><span style="color: hsl(120, 100%, 40%);">+ getpeername(con->write_queue.bfd.fd, (struct sockaddr *) &sock, &len);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " Conn-status: Connected, auth: %d, fd: %d, peername: %s, pending-stats: %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ con->authenticated, con->write_queue.bfd.fd,</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntoa(sock.sin_addr), con->pending_dlcx_count,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " Conn-status: Disconnected%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_out_rate_ctr_group(vty, " ", conf->stats.ctrg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(con, &conf->nat->bsc_connections, list_entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (con->cfg != conf)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- connected = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " Connected: %d%s", connected, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(show_stats,</span><br><span style="color: hsl(0, 100%, 40%);">- show_stats_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "show statistics [NR]",</span><br><span style="color: hsl(0, 100%, 40%);">- SHOW_STR "Display network statistics\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Number of the BSC\n")</span><br><span style="color: hsl(120, 100%, 40%);">+#define BSC_ID_HELP \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Identify BSC by nr\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Identify BSC by token\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Identify BSC by lac\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Show all BSC\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "NR/token/lac of the BSC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_bsc_status, show_bsc_status_cmd, "show bsc status (nr|token|lac|all) [IDENT]",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR BSC_STR "Status of BSC\n" BSC_ID_HELP)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *id_type = argv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *id = argv[1];</span><br><span> struct bsc_config *conf;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool by_token = false, by_nr = false, by_lac = false, all = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool found_one = false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int nr = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (argc == 1)</span><br><span style="color: hsl(0, 100%, 40%);">- nr = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dump_stat_total(vty, _nat);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(conf, &_nat->bsc_configs, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (argc == 1 && nr != conf->nr)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- dump_stat_bsc(vty, conf);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(id_type, "all") == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ all = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_stat_total(vty, _nat);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc != 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: type %s requires an argument%s", id_type, 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%);">+ if (strcmp(id_type, "nr") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ by_nr = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (strcmp(id_type, "token") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ by_token = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (strcmp(id_type, "lac") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ by_lac = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(show_stats_lac,</span><br><span style="color: hsl(0, 100%, 40%);">- show_stats_lac_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "show statistics-by-lac <0-65535>",</span><br><span style="color: hsl(0, 100%, 40%);">- SHOW_STR "Display network statistics by lac\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "The lac of the BSC\n")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int lac;</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_config *conf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lac = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dump_stat_total(vty, _nat);</span><br><span> llist_for_each_entry(conf, &_nat->bsc_configs, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bsc_config_handles_lac(conf, lac))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (by_nr && conf->nr != atoi(id))</span><br><span> continue;</span><br><span style="color: hsl(0, 100%, 40%);">- dump_stat_bsc(vty, conf);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (by_token && strcmp(conf->token, id))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (by_lac && !bsc_config_handles_lac(conf, atoi(id)))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ found_one = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_bsc_status(vty, conf);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!all && !found_one) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: BSC with %s %s not found%s", id_type, id, 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> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -1313,9 +1321,7 @@</span><br><span> install_element_ve(&show_sccp_cmd);</span><br><span> install_element_ve(&show_bsc_cmd);</span><br><span> install_element_ve(&show_nat_bsc_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element_ve(&show_bsc_cfg_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element_ve(&show_stats_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element_ve(&show_stats_lac_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_bsc_status_cmd);</span><br><span> install_element_ve(&close_bsc_cmd);</span><br><span> install_element_ve(&show_msc_cmd);</span><br><span> install_element_ve(&test_regex_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9755">change 9755</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/9755"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I47bfd4fb800390505bdeb0f1d0bd1306fb888a59 </div>
<div style="display:none"> Gerrit-Change-Number: 9755 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>