From b361ea7037a306621a0308a35c700dc1d76b7f11 Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Tue, 18 Dec 2018 18:57:41 +0100 Subject: use vty->type instead of local variable We can check if we're parsing the config file by checking whether vty->type equals VTY_FILE. This avoids the use of an extra local variable to track the parsing state. Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Fixes: 1051c4208834c22d344dd92d25addfd8e5d95993 Related: OS#3355 --- src/libmsc/msc_vty.c | 2 +- src/osmo-msc/msc_main.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index c5d28322b..7745e5d99 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -466,7 +466,7 @@ DEFUN(cfg_msc_ipa_name, "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " "The default is 'MSC-00-00-00-00-00-00'.\n") { - if (!msc_parsing_config_file) { + if (vty->type != VTY_FILE) { vty_out(vty, "The IPA name cannot be changed at run-time; " "It can only be set in the configuraton file.%s", VTY_NEWLINE); return CMD_WARNING; diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 4dce2b8f4..6eecf46e4 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -515,8 +515,6 @@ extern void *tall_gsms_ctx; extern void *tall_call_ctx; extern void *tall_trans_ctx; -bool msc_parsing_config_file = false; - int main(int argc, char **argv) { int rc; @@ -569,9 +567,7 @@ int main(int argc, char **argv) return -1; #endif - msc_parsing_config_file = true; rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); - msc_parsing_config_file = false; if (rc < 0) { LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n", msc_cmdline_config.config_file); -- cgit v1.2.3