diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-11-22 18:30:21 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-11-26 00:03:32 +0100 |
commit | bb62b3f053cacc5c18b7b62936251a5bcef826ec (patch) | |
tree | 8411a412f385b836a2b488921e71a45e88ef3367 /openbsc/src/bsc | |
parent | 625b6e4dab63405a12a1c24bf3c9f1c5ce936f6f (diff) |
mid-call: Rename ussd-grace to mid-call
Diffstat (limited to 'openbsc/src/bsc')
-rw-r--r-- | openbsc/src/bsc/osmo_bsc_grace.c | 4 | ||||
-rw-r--r-- | openbsc/src/bsc/osmo_bsc_vty.c | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/openbsc/src/bsc/osmo_bsc_grace.c b/openbsc/src/bsc/osmo_bsc_grace.c index 89f05f427..882ae602e 100644 --- a/openbsc/src/bsc/osmo_bsc_grace.c +++ b/openbsc/src/bsc/osmo_bsc_grace.c @@ -69,7 +69,7 @@ static int handle_grace(struct gsm_network *network) struct gsm_bts *bts; struct gsm_bts_trx *trx; - if (!network->msc_data->ussd_grace_txt) + if (!network->msc_data->mid_call_txt) return 0; llist_for_each_entry(bts, &network->bts_list, list) { @@ -78,7 +78,7 @@ static int handle_grace(struct gsm_network *network) struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; for (lchan_nr = 0; lchan_nr < TS_MAX_LCHAN; ++lchan_nr) { handle_sub(&ts->lchan[lchan_nr], - network->msc_data->ussd_grace_txt); + network->msc_data->mid_call_txt); } } } diff --git a/openbsc/src/bsc/osmo_bsc_vty.c b/openbsc/src/bsc/osmo_bsc_vty.c index 980dfa44b..804b4112a 100644 --- a/openbsc/src/bsc/osmo_bsc_vty.c +++ b/openbsc/src/bsc/osmo_bsc_vty.c @@ -69,9 +69,9 @@ static int config_write_msc(struct vty *vty) vty_out(vty, " ip-dscp %d%s", data->msc_ip_dscp, VTY_NEWLINE); vty_out(vty, " timeout-ping %d%s", data->ping_timeout, VTY_NEWLINE); vty_out(vty, " timeout-pong %d%s", data->pong_timeout, VTY_NEWLINE); - if (data->ussd_grace_txt) - vty_out(vty, "bsc-grace-text %s%s", data->ussd_grace_txt, VTY_NEWLINE); - vty_out(vty, " bsc-grace-timeout %d%s", data->ussd_grace_timeout, VTY_NEWLINE); + if (data->mid_call_txt) + vty_out(vty, "mid-call-text %s%s", data->mid_call_txt, VTY_NEWLINE); + vty_out(vty, " mid-call-timeout %d%s", data->mid_call_timeout, VTY_NEWLINE); if (data->audio_length != 0) { int i; @@ -247,9 +247,9 @@ DEFUN(cfg_net_msc_pong_time, return CMD_SUCCESS; } -DEFUN(cfg_net_msc_grace_ussd, - cfg_net_msc_grace_ussd_cmd, - "bsc-grace-text .TEXT", +DEFUN(cfg_net_msc_mid_call_text, + cfg_net_msc_mid_call_text_cmd, + "mid-call-text .TEXT", "Set the USSD notifcation to be send.\n" "Text to be sent\n") { struct osmo_msc_data *data = osmo_msc_data(vty); @@ -257,18 +257,18 @@ DEFUN(cfg_net_msc_grace_ussd, if (!txt) return CMD_WARNING; - bsc_replace_string(data, &data->ussd_grace_txt, txt); + bsc_replace_string(data, &data->mid_call_txt, txt); talloc_free(txt); return CMD_SUCCESS; } -DEFUN(cfg_net_msc_grace_timeout, - cfg_net_msc_grace_timeout_cmd, - "bsc-grace-timeout NR", +DEFUN(cfg_net_msc_mid_call_timeout, + cfg_net_msc_mid_call_timeout_cmd, + "mid-call-timeout NR", "Switch from Grace to Off in NR seconds.\n" "Timeout in seconds\n") { struct osmo_msc_data *data = osmo_msc_data(vty); - data->ussd_grace_timeout = atoi(argv[0]); + data->mid_call_timeout = atoi(argv[0]); return CMD_SUCCESS; } @@ -288,8 +288,8 @@ int bsc_vty_init_extra(void) install_element(MSC_NODE, &cfg_net_msc_prio_cmd); install_element(MSC_NODE, &cfg_net_msc_ping_time_cmd); install_element(MSC_NODE, &cfg_net_msc_pong_time_cmd); - install_element(MSC_NODE, &cfg_net_msc_grace_ussd_cmd); - install_element(MSC_NODE, &cfg_net_msc_grace_timeout_cmd); + install_element(MSC_NODE, &cfg_net_msc_mid_call_text_cmd); + install_element(MSC_NODE, &cfg_net_msc_mid_call_timeout_cmd); return 0; } |