Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/12387
Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
......................................................................
vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
during code review, I completely overlooked this:
We've added the 'ipa-name', which identifies the MSC on the GSUP link to the
HLR, under the 'msc' section, while all other GSUP/HLR related config is under
the 'hlr' section.
Before we roll that out in a release, move it over to 'hlr'.
Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425
---
M src/libmsc/msc_vty.c
1 file changed, 21 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/1
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index c5d2832..bb57d65 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -458,24 +458,6 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_msc_ipa_name,
- cfg_msc_ipa_name_cmd,
- "ipa-name NAME",
- "Set the IPA name of this MSC\n"
- "A unique name for this MSC. For example: PLMN + redundancy server
number: MSC-901-70-0. "
- "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) {
- 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;
- }
-
- gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);
- return CMD_SUCCESS;
-}
-
static int config_write_msc(struct vty *vty)
{
vty_out(vty, "msc%s", VTY_NEWLINE);
@@ -509,9 +491,6 @@
gsmnet->emergency.route_to_msisdn, VTY_NEWLINE);
}
- if (gsmnet->msc_ipa_name)
- vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name,
VTY_NEWLINE);
-
mgcp_client_config_write(vty, " ");
#ifdef BUILD_IU
ranap_iu_vty_config_write(vty, " ");
@@ -1485,6 +1464,24 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_hlr_ipa_name,
+ cfg_hlr_ipa_name_cmd,
+ "ipa-name NAME",
+ "Set the IPA name of this MSC\n"
+ "A unique name for this MSC. For example: PLMN + redundancy server
number: MSC-901-70-0. "
+ "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) {
+ 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;
+ }
+
+ gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);
+ return CMD_SUCCESS;
+}
+
static int config_write_hlr(struct vty *vty)
{
vty_out(vty, "hlr%s", VTY_NEWLINE);
@@ -1492,6 +1489,8 @@
gsmnet->gsup_server_addr_str, VTY_NEWLINE);
vty_out(vty, " remote-port %u%s",
gsmnet->gsup_server_port, VTY_NEWLINE);
+ if (gsmnet->msc_ipa_name)
+ vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name,
VTY_NEWLINE);
return CMD_SUCCESS;
}
@@ -1532,7 +1531,6 @@
install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd);
install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd);
install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd);
- install_element(MSC_NODE, &cfg_msc_ipa_name_cmd);
mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf);
#ifdef BUILD_IU
@@ -1582,4 +1580,5 @@
install_node(&hlr_node, config_write_hlr);
install_element(HLR_NODE, &cfg_hlr_remote_ip_cmd);
install_element(HLR_NODE, &cfg_hlr_remote_port_cmd);
+ install_element(HLR_NODE, &cfg_hlr_ipa_name_cmd);
}
--
To view, visit https://gerrit.osmocom.org/12387
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425
Gerrit-Change-Number: 12387
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <[email protected]>
