From ffc7f39f016091e19eedb18528228927e198a9c1 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sat, 18 Jan 2020 18:39:41 +0700 Subject: [PATCH] VTY: add osmo_tdef introspection and configuration commands This change introduces several new VTY commands letting the user a possibility to introspect and reconfigure some of the existing timers implemented using libosmocore's osmo_tdef API. At the moment this covers the following timers: - MGW specific timers: - X1 - MGCP response timeout, - X2 - RTP stream establishing timeout, - RAN specific timers (same names for GERAN and UTRAN): - X1 - Authentication and Ciphering timeout, - X2 - RAN connection release sanity timeout, - X3 - Handover procedure timeout. The following commands are introduced: - 'enable' node: - show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] - 'config-msc' node: - timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] Both MNCC and SCCP related timer definitions are empty at the moment. Achieved by using osmo_tdef_group API of libosmovty. Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Related: OS#4368 --- doc/manuals/vty/msc_vty_reference.xml | 40 +++++++++++++++++++++++++++ include/osmocom/msc/msc_common.h | 4 +++ src/libmsc/msc_net_init.c | 15 ++++++++++ src/libmsc/msc_vty.c | 7 +++++ tests/test_nodes.vty | 1 + 5 files changed, 67 insertions(+) diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index 7fba1a9ec..36cbf77a9 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -576,6 +576,19 @@ + + + + + + + + + + + + + @@ -1392,6 +1405,19 @@ + + + + + + + + + + + + + @@ -2910,6 +2936,20 @@ + + + + + + + + + + + + + + diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h index 78337f764..bd85722cd 100644 --- a/include/osmocom/msc/msc_common.h +++ b/include/osmocom/msc/msc_common.h @@ -1,5 +1,7 @@ #pragma once +#include + #include #include @@ -7,6 +9,8 @@ struct msgb; struct gsm_network; struct vlr_subscr; +extern struct osmo_tdef_group msc_tdef_group[]; + #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 91b6165bd..ffb8a3ba4 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -31,10 +31,25 @@ #include #include +/* TODO: would be great to have all timer declarations in one place */ +#include +#include +#include + struct osmo_tdef mncc_tdefs[] = { {} }; +struct osmo_tdef_group msc_tdef_group[] = { + { .name = "mgw", .tdefs = g_mgw_tdefs, .desc = "MGW (Media Gateway) interface" }, + { .name = "mncc", .tdefs = mncc_tdefs, .desc = "MNCC (Mobile Network Call Control) interface" }, + { .name = "sccp", .tdefs = g_sccp_tdefs, .desc = "SCCP (Signalling Connection Control Part)" }, + { .name = "geran", .tdefs = msc_tdefs_geran, .desc = "GERAN (GSM EDGE Radio Access Network)" }, + { .name = "utran", .tdefs = msc_tdefs_utran, .desc = "UTRAN (UMTS Terrestrial Radio Access Network)" }, + { .name = "sgs", .tdefs = msc_tdefs_sgs, .desc = "SGs interface towards MME" }, + { /* terminator */ } +}; + #include struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv) diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 90cfc9daa..53d44dc7d 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -36,6 +36,7 @@ #include +#include #include #include #include @@ -716,6 +717,9 @@ static int config_write_msc(struct vty *vty) neighbor_ident_vty_write(vty); + /* Timer introspection commands (generic osmo_tdef API) */ + osmo_tdef_vty_groups_write(vty, " "); + return CMD_SUCCESS; } @@ -2002,6 +2006,9 @@ void msc_vty_init(struct gsm_network *msc_network) neighbor_ident_vty_init(msc_network); + /* Timer configuration commands (generic osmo_tdef API) */ + osmo_tdef_vty_groups_init(MSC_NODE, msc_tdef_group); + mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); #ifdef BUILD_IU ranap_iu_vty_init(MSC_NODE, (enum ranap_nsap_addr_enc*)&msc_network->iu.rab_assign_addr_enc); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index a4e0e15db..2c2ce1b84 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -69,6 +69,7 @@ OsmoMSC(config-msc)# list neighbor (a|iu) lac-ci <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME neighbor (a|iu) cgi <0-999> <0-999> <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME no neighbor (a|iu) (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME + timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D