diff options
| -rw-r--r-- | include/osmocom/msc/gsm_data.h | 1 | ||||
| -rw-r--r-- | include/osmocom/msc/msc_common.h | 1 | ||||
| -rw-r--r-- | src/libmsc/msc_vty.c | 23 | ||||
| -rw-r--r-- | src/libmsc/osmo_msc.c | 7 | ||||
| -rw-r--r-- | src/osmo-msc/msc_main.c | 13 | ||||
| -rw-r--r-- | tests/test_nodes.vty | 25 |
6 files changed, 68 insertions, 2 deletions
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index d3cb7d885..63af3e736 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -140,6 +140,7 @@ struct gsm_network { struct osmo_counter *active_nc_ss; /* layer 4 */ + char *mncc_sock_path; struct mncc_sock_state *mncc_state; mncc_recv_cb_t mncc_recv; struct llist_head upqueue; diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h index ffe8902e2..3ca34692d 100644 --- a/include/osmocom/msc/msc_common.h +++ b/include/osmocom/msc/msc_common.h @@ -15,6 +15,7 @@ enum nsap_addr_enc { typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); +void gsm_network_set_mncc_sock_path(struct gsm_network *net, const char *mncc_sock_path); int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index d9e57a73b..e1d1b4020 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -339,6 +339,25 @@ DEFUN(cfg_msc, cfg_msc_cmd, #define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n" #define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n" +DEFUN(cfg_msc_mncc_internal, + cfg_msc_mncc_internal_cmd, + "mncc internal", + MNCC_STR "Use internal MNCC handler (default; changes need a program restart)\n") +{ + gsm_network_set_mncc_sock_path(gsmnet, NULL); + return CMD_SUCCESS; +} + +DEFUN(cfg_msc_mncc_external, + cfg_msc_mncc_external_cmd, + "mncc external MNCC_SOCKET_PATH", + MNCC_STR "Use external MNCC handler (changes need a program restart)\n" + "File system path to create the MNCC unix domain socket at\n") +{ + gsm_network_set_mncc_sock_path(gsmnet, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_msc_mncc_guard_timeout, cfg_msc_mncc_guard_timeout_cmd, "mncc guard-timeout <0-255>", @@ -442,6 +461,8 @@ DEFUN(cfg_msc_emergency_msisdn, cfg_msc_emergency_msisdn_cmd, static int config_write_msc(struct vty *vty) { 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); vty_out(vty, " mncc guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", @@ -1451,6 +1472,8 @@ void msc_vty_init(struct gsm_network *msc_network) install_element(CONFIG_NODE, &cfg_msc_cmd); install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); + install_element(MSC_NODE, &cfg_msc_mncc_internal_cmd); + install_element(MSC_NODE, &cfg_msc_mncc_external_cmd); install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_deprecated_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 52277b75d..37c1d15a4 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -76,6 +76,13 @@ struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv) return net; } +void gsm_network_set_mncc_sock_path(struct gsm_network *net, const char *mncc_sock_path) +{ + if (net->mncc_sock_path) + talloc_free(net->mncc_sock_path); + net->mncc_sock_path = mncc_sock_path ? talloc_strdup(net, mncc_sock_path) : NULL; +} + /* Receive a SAPI-N-REJECT from BSC */ void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci) { diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 157d5ae56..8500b9722 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -573,11 +573,20 @@ int main(int argc, char **argv) return 1; } - /* Initialize MNCC socket if appropriate */ + /* Initialize MNCC socket if appropriate. If the cmdline option -M is present, it overrides the .cfg file + * setting 'msc' / 'mncc external MNCC_SOCKET_PATH'. Note that when -M is given, it "bleeds" back into the vty + * 'write' command and is reflected in the written out 'mncc external' cfg. */ if (msc_cmdline_config.mncc_sock_path) { + LOGP(DMNCC, LOGL_NOTICE, + "MNCC socket path is configured from commandline argument -M." + " This affects a written-back config file. Instead consider using the config file directly" + " ('msc' / 'mncc external MNCC_SOCKET_PATH').\n"); + gsm_network_set_mncc_sock_path(msc_network, msc_cmdline_config.mncc_sock_path); + } + if (msc_network->mncc_sock_path) { msc_network->mncc_recv = mncc_sock_from_cc; rc = mncc_sock_init(msc_network, - msc_cmdline_config.mncc_sock_path); + msc_network->mncc_sock_path); if (rc) { fprintf(stderr, "MNCC socket initialization failed. exiting.\n"); exit(1); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 9fa9d2a22..c4ab38791 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -30,6 +30,8 @@ OsmoMSC(config)# msc OsmoMSC(config-msc)# list ... assign-tmsi + mncc internal + mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> @@ -46,6 +48,29 @@ OsmoMSC(config-msc)# list mgw bts-base <0-65534> ... +OsmoMSC(config-msc)# mncc? + mncc Configure Mobile Network Call Control + +OsmoMSC(config-msc)# mncc ? + internal Use internal MNCC handler (default; changes need a program restart) + external Use external MNCC handler (changes need a program restart) + guard-timeout Set global guard timer for mncc interface activity + +OsmoMSC(config-msc)# mncc external ? + MNCC_SOCKET_PATH File system path to create the MNCC unix domain socket at + +OsmoMSC(config-msc)# mncc external /path/not/used +OsmoMSC(config-msc)# show running-config +... +msc +... + mncc external /path/not/used +... + +OsmoMSC(config-msc)# mncc internal +OsmoMSC(config-msc)# show running-config +... ! mncc external + OsmoMSC(config-msc)# exit OsmoMSC(config)# mncc-int OsmoMSC(config-mncc-int)# list |