diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-05-25 15:51:05 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-05-25 18:58:16 +0000 |
| commit | 3909d99faeda91befc05c50bf8b3d404bee1e68f (patch) | |
| tree | da7a6b1a5523d82601ea2b5afbc9eff6b7d8ec6d /src | |
| parent | 631bde0e9b8245225d7df185480aaa84c732c2df (diff) | |
vty: Permit selection of other ASP protocol than M3UA
We used to have hard-coded M3UA. Let's allow the user to configure
this per MSC using a new "asp-protocol (m3ua|sua|ipa)" VTY command.
For SUA this should just work 1:1 without any trouble. For IPA,
this of course only changes the underlying transport without reflecting
the various differences in terms of BSSMAP ASSIGNMENT, MGCP handling,
etc.
Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13
Related: OS#2544
Diffstat (limited to 'src')
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_msc.c | 1 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_sigtran.c | 2 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_vty.c | 16 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index e9309ea1a..612a00bb3 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -98,6 +98,7 @@ struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr) msc_data->nr = nr; msc_data->allow_emerg = 1; + msc_data->a.asp_proto = OSMO_SS7_ASP_PROT_M3UA; /* Defaults for the audio setup */ msc_data->amr_conf.m5_90 = 1; diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index e3d48298d..2c3507d9e 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -447,7 +447,7 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs) default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC); msc->a.sccp = osmo_sccp_simple_client_on_ss7_id(msc, msc->a.cs7_instance, msc_name, default_pc, - OSMO_SS7_ASP_PROT_M3UA, 0, NULL, 0, NULL); + msc->a.asp_proto, 0, NULL, 0, NULL); if (!msc->a.sccp) return -EINVAL; diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 36c3223bd..bda89c142 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -181,6 +181,7 @@ static void write_msc(struct vty *vty, struct bsc_msc_data *msc) vty_out(vty, " msc-addr %s%s", msc->a.msc_addr_name, VTY_NEWLINE); } + vty_out(vty, " asp-protocol %s%s", osmo_ss7_asp_protocol_name(msc->a.asp_proto), VTY_NEWLINE); /* write MGW configuration */ mgcp_client_config_write(vty, " "); @@ -672,6 +673,20 @@ DEFUN(cfg_msc_cs7_msc_addr, return CMD_SUCCESS; } +DEFUN(cfg_msc_cs7_asp_proto, + cfg_msc_cs7_asp_proto_cmd, + "asp-protocol (m3ua|sua|ipa)", + "A interface protocol to use for this MSC)\n" + "MTP3 User Adaptation\n" + "SCCP User Adaptation\n" + "IPA Multiplex (SCCP Lite)\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + + msc->a.asp_proto = get_string_value(osmo_ss7_asp_protocol_vals, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_net_bsc_mid_call_text, cfg_net_bsc_mid_call_text_cmd, "mid-call-text .TEXT", @@ -951,6 +966,7 @@ int bsc_vty_init_extra(void) install_element(MSC_NODE, &cfg_msc_no_acc_lst_name_cmd); install_element(MSC_NODE, &cfg_msc_cs7_bsc_addr_cmd); install_element(MSC_NODE, &cfg_msc_cs7_msc_addr_cmd); + install_element(MSC_NODE, &cfg_msc_cs7_asp_proto_cmd); /* Deprecated: ping time config, kept to support legacy config files. */ install_element(MSC_NODE, &cfg_net_msc_no_ping_time_cmd); |