laforge submitted this change.

View Change


Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved
vty: show mscs: add BSSMAP state

New output:
OsmoBSC> show mscs
MSC 0: RI=SSN_PC,PC=0.23.3,SSN=BSSAP <-> RI=SSN_PC,PC=0.23.1,SSN=BSSAP
ASP protocol: m3ua
BSSMAP state: CONNECTED

Closes: OS#6741
Change-Id: I23ddba7d935e5cc5dae041458207c674ccb9d013
---
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bssmap_reset.c
2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 27ceae4..8a0747c 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -3259,6 +3259,10 @@
vty_out(vty, " ASP protocol: %s%s",
osmo_ss7_asp_protocol_name(msc->a.asp_proto),
VTY_NEWLINE);
+ vty_out(vty, " BSSMAP state: %s%s",
+ msc->a.bssmap_reset ? osmo_fsm_inst_state_name(msc->a.bssmap_reset->fi) : "",
+ VTY_NEWLINE);
+
}

return CMD_SUCCESS;
diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c
index ac304a5..018ecba 100644
--- a/src/osmo-bsc/bssmap_reset.c
+++ b/src/osmo-bsc/bssmap_reset.c
@@ -198,7 +198,7 @@

static struct osmo_fsm_state bssmap_reset_fsm_states[] = {
[BSSMAP_RESET_ST_DISC] = {
- .name = "DISC",
+ .name = "DISCONNECTED",
.in_event_mask = 0
| S(BSSMAP_RESET_EV_RX_RESET)
| S(BSSMAP_RESET_EV_RX_RESET_ACK)
@@ -213,7 +213,7 @@
.action = bssmap_reset_disc_action,
},
[BSSMAP_RESET_ST_CONN] = {
- .name = "CONN",
+ .name = "CONNECTED",
.in_event_mask = 0
| S(BSSMAP_RESET_EV_RX_RESET)
| S(BSSMAP_RESET_EV_RX_RESET_ACK)

To view, visit change 35597. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I23ddba7d935e5cc5dae041458207c674ccb9d013
Gerrit-Change-Number: 35597
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged