From 27b40c601c41fde70446ad553629494234c07662 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 14 Feb 2018 00:16:29 +0100 Subject: [PATCH] remove unused VTY command "location updating reject cause" OsmoMSC is using whatever reject cause is apropriate in the given situation. This user-configurable reject cause only had relevance in OsmoNITB, and hence it is an unused parameter that can be removed in OsmoMSC. Related: OS#2528 Change-Id: Ie1f39e706477aaf42051877b52d4b3ae1c5f138e --- doc/examples/osmo-msc/osmo-msc.cfg | 1 - doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg | 1 - doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg | 1 - include/osmocom/msc/gsm_data.h | 1 - src/libcommon-cs/common_cs_vty.c | 17 ----------------- src/libmsc/msc_vty.c | 2 -- 6 files changed, 23 deletions(-) diff --git a/doc/examples/osmo-msc/osmo-msc.cfg b/doc/examples/osmo-msc/osmo-msc.cfg index 126116052..4cccebe8c 100644 --- a/doc/examples/osmo-msc/osmo-msc.cfg +++ b/doc/examples/osmo-msc/osmo-msc.cfg @@ -10,7 +10,6 @@ network short name OsmoMSC long name OsmoMSC auth policy closed - location updating reject cause 13 encryption a5 0 rrlp mode none mm info 1 diff --git a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg index a5131e4e5..ea929128e 100644 --- a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg +++ b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg @@ -10,7 +10,6 @@ network short name OsmoMSC long name OsmoMSC auth policy closed - location updating reject cause 13 encryption a5 0 rrlp mode none mm info 1 diff --git a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg index 72f3410dc..702629360 100644 --- a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg +++ b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg @@ -10,7 +10,6 @@ network short name OsmoMSC long name OsmoMSC auth policy closed - location updating reject cause 13 encryption a5 0 rrlp mode none mm info 1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index cde1ce203..0548b80bd 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -238,7 +238,6 @@ struct gsm_network { enum gsm_auth_policy auth_policy; regex_t authorized_regexp; char *authorized_reg_str; - enum gsm48_reject_value reject_cause; /* bit-mask of permitted encryption algorithms. LSB=A5/0, MSB=A5/7 */ uint8_t a5_encryption_mask; bool authentication_required; diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c index a4862ee77..e5972f1e2 100644 --- a/src/libcommon-cs/common_cs_vty.c +++ b/src/libcommon-cs/common_cs_vty.c @@ -137,22 +137,6 @@ DEFUN(cfg_net_authorize_regexp, cfg_net_authorize_regexp_cmd, return CMD_SUCCESS; } -DEFUN(cfg_net_reject_cause, - cfg_net_reject_cause_cmd, - "location updating reject cause <2-111>", - "Set the reject cause of location updating reject\n" - "Set the reject cause of location updating reject\n" - "Set the reject cause of location updating reject\n" - "Set the reject cause of location updating reject\n" - "Cause Value as Per GSM TS 04.08\n") -{ - struct gsm_network *gsmnet = gsmnet_from_vty(vty); - - gsmnet->reject_cause = atoi(argv[0]); - - return CMD_SUCCESS; -} - DEFUN(cfg_net_encryption, cfg_net_encryption_cmd, "encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]", @@ -324,7 +308,6 @@ int common_cs_vty_init(struct gsm_network *network, install_element(GSMNET_NODE, &cfg_net_name_long_cmd); install_element(GSMNET_NODE, &cfg_net_auth_policy_cmd); install_element(GSMNET_NODE, &cfg_net_authorize_regexp_cmd); - install_element(GSMNET_NODE, &cfg_net_reject_cause_cmd); install_element(GSMNET_NODE, &cfg_net_encryption_cmd); install_element(GSMNET_NODE, &cfg_net_authentication_cmd); install_element(GSMNET_NODE, &cfg_net_rrlp_mode_cmd); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index ad4014da9..49081c66c 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -187,8 +187,6 @@ static int config_write_net(struct vty *vty) vty_out(vty, " short name %s%s", gsmnet->name_short, VTY_NEWLINE); vty_out(vty, " long name %s%s", gsmnet->name_long, VTY_NEWLINE); vty_out(vty, " auth policy %s%s", gsm_auth_policy_name(gsmnet->auth_policy), VTY_NEWLINE); - vty_out(vty, " location updating reject cause %u%s", - gsmnet->reject_cause, VTY_NEWLINE); vty_out(vty, " encryption a5"); for (i = 0; i < 8; i++) { if (gsmnet->a5_encryption_mask & (1 << i))