cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

mid-call: Rename ussd-grace to mid-call

This commit is contained in:
Holger Hans Peter Freyther 2010-11-22 18:30:21 +01:00
parent 625b6e4dab
commit bb62b3f053
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openbsc/include/openbsc/osmo_msc_data.h
View File

@ -60,8 +60,8 @@ struct osmo_msc_data {
struct write_queue mgcp_agent;
/* rf ctl related bits */
char *ussd_grace_txt;
int ussd_grace_timeout;
char *mid_call_txt;
int mid_call_timeout;
struct osmo_bsc_rf *rf_ctl;
/* ussd welcome text */

4
openbsc/src/bsc/osmo_bsc_grace.c
View File

@ -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);
}
}
}

26
openbsc/src/bsc/osmo_bsc_vty.c
View File

@ -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;
}