aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/osmocom/msc/vty.h2
-rw-r--r--src/libmsc/msc_vty.c2
-rw-r--r--src/osmo-msc/msc_main.c4
3 files changed, 1 insertions, 7 deletions
diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h
index 60a36d7ae..6a55df776 100644
--- a/include/osmocom/msc/vty.h
+++ b/include/osmocom/msc/vty.h
@@ -31,6 +31,4 @@ void msc_vty_init(struct gsm_network *msc_network);
struct gsm_network *gsmnet_from_vty(struct vty *vty);
-extern bool msc_parsing_config_file;
-
#endif
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);