fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35414?usp=email )
Change subject: VTY: always print MNCC handler type (internal/external) ......................................................................
VTY: always print MNCC handler type (internal/external)
... so that it's clear which MNCC handler is used by looking at the output of `show running-config`.
Change-Id: Id1fe7aecc1c8445db48ff5fddcf6df0f05ba5e2e --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 21 insertions(+), 2 deletions(-)
Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index f693cb6..1f389f4 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -763,6 +763,8 @@ vty_out(vty, "msc%s", VTY_NEWLINE); if (gsmnet->mncc_sock_path) vty_out(vty, " mncc external %s%s", gsmnet->mncc_sock_path, VTY_NEWLINE); + else + vty_out(vty, " mncc internal%s", VTY_NEWLINE); vty_out(vty, " mncc guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " ncss guard-timeout %i%s", diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 836de66..5e4b793 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -99,12 +99,16 @@ OsmoMSC(config-msc)# show running-config ... msc -... +... ! mncc internal mncc external /path/not/used -... +... ! mncc internal
OsmoMSC(config-msc)# mncc internal OsmoMSC(config-msc)# show running-config +... +msc +... ! mncc external + mncc internal ... ! mncc external
OsmoMSC(config-msc)# exit @@ -157,6 +161,7 @@ mm info 1 ... msc + mncc internal mncc guard-timeout 180 ncss guard-timeout 30 assign-tmsi