diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-07-27 21:06:29 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-07-27 21:06:29 +0800 |
| commit | 175a7b42afa8889077603a97e98b7c928fa85518 (patch) | |
| tree | fc8382d7504659e867ea2da0538b9968280f8720 | |
| parent | 38a2653801d3a684f26bad2169c129383a38fc53 (diff) | |
bsc_msc_ip: Use ip-dscp and provide the old value as alias.
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 2 | ||||
| -rw-r--r-- | openbsc/src/bsc_msc_ip.c | 6 | ||||
| -rw-r--r-- | openbsc/src/vty_interface.c | 11 |
3 files changed, 12 insertions, 7 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index b2b89571e..be5158bbb 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -692,7 +692,7 @@ struct gsm_network { char *bsc_token; char *msc_ip; int msc_port; - int msc_prio; + int msc_ip_dscp; struct bsc_msc_connection *msc_con; int ping_timeout; int pong_timeout; diff --git a/openbsc/src/bsc_msc_ip.c b/openbsc/src/bsc_msc_ip.c index 774b2afef..36381add7 100644 --- a/openbsc/src/bsc_msc_ip.c +++ b/openbsc/src/bsc_msc_ip.c @@ -1,8 +1,8 @@ /* The BSC Process to handle GSM08.08 (A-Interface) */ /* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org> - * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2009 by On-Waves + * (C) 2009-2010 by Holger Hans Peter Freyther <zecke@selfish.org> + * (C) 2009-2010 by On-Waves * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -1254,7 +1254,7 @@ int main(int argc, char **argv) bsc_gsmnet->msc_con = bsc_msc_create(msc, bsc_gsmnet->msc_port, - bsc_gsmnet->msc_prio); + bsc_gsmnet->msc_ip_dscp); if (!bsc_gsmnet->msc_con) { fprintf(stderr, "Creating a bsc_msc_connection failed.\n"); exit(1); diff --git a/openbsc/src/vty_interface.c b/openbsc/src/vty_interface.c index 6486c0d21..863430843 100644 --- a/openbsc/src/vty_interface.c +++ b/openbsc/src/vty_interface.c @@ -525,7 +525,7 @@ static int config_write_net(struct vty *vty) vty_out(vty, " bsc_token %s%s", gsmnet->bsc_token, VTY_NEWLINE); vty_out(vty, " msc ip %s%s", gsmnet->msc_ip, VTY_NEWLINE); vty_out(vty, " msc port %d%s", gsmnet->msc_port, VTY_NEWLINE); - vty_out(vty, " msc ip-tos %d%s", gsmnet->msc_prio, VTY_NEWLINE); + vty_out(vty, " msc ip-dscp %d%s", gsmnet->msc_ip_dscp, VTY_NEWLINE); vty_out(vty, " timeout ping %d%s", gsmnet->ping_timeout, VTY_NEWLINE); vty_out(vty, " timeout pong %d%s", gsmnet->pong_timeout, VTY_NEWLINE); @@ -1414,13 +1414,17 @@ DEFUN(cfg_net_msc_port, DEFUN(cfg_net_msc_prio, cfg_net_msc_prio_cmd, - "msc ip-tos <0-255>", + "msc ip-dscp <0-255>", "Set the IP_TOS socket attribite") { - gsmnet->msc_prio = atoi(argv[0]); + gsmnet->msc_ip_dscp = atoi(argv[0]); return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_net_msc_prio, cfg_net_msc_ip_tos_cmd, + "msc ip-tos <0-255>", + "Set the IP_TOS socket attribite\n" "The DSCP to use.\n") + DEFUN(cfg_net_ping_time, cfg_net_ping_time_cmd, "timeout ping NR", @@ -2257,6 +2261,7 @@ int bsc_vty_init(struct gsm_network *net) install_element(GSMNET_NODE, &cfg_net_pag_any_tch_cmd); install_element(GSMNET_NODE, &cfg_net_msc_ip_cmd); install_element(GSMNET_NODE, &cfg_net_msc_port_cmd); + install_element(GSMNET_NODE, &cfg_net_msc_ip_tos_cmd); install_element(GSMNET_NODE, &cfg_net_msc_prio_cmd); install_element(GSMNET_NODE, &cfg_net_ping_time_cmd); install_element(GSMNET_NODE, &cfg_net_pong_time_cmd); |