Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

dexter gerrit-no-reply at lists.osmocom.org
Thu Jul 2 09:12:03 UTC 2020 

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 )


Change subject: mgcp_vty: be more specific about E1 trunks
......................................................................

mgcp_vty: be more specific about E1 trunks

Currently only E1 trunks can be crated using the node "trunk". However,
should we ever introduce another trunk type we will not be able to
distinguish the new trunk type. Lets rename "trunk" to "trunk-e1" along
with its underlying constants and function names so that we can easily
add another "trunk-t1" for example without making old configs
incompatible with the old concept.

Related: OS#2659
Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e
---
M include/osmocom/mgcp/vty.h
M src/libosmo-mgcp/mgcp_vty.c
M src/osmo-mgw/mgw_main.c
3 files changed, 34 insertions(+), 34 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/19103/1

diff --git a/include/osmocom/mgcp/vty.h b/include/osmocom/mgcp/vty.h
index bf6b7a8..3d7ddb1 100644
--- a/include/osmocom/mgcp/vty.h
+++ b/include/osmocom/mgcp/vty.h
@@ -4,5 +4,5 @@
 
 enum mgcp_vty_node {
 	MGCP_NODE = _LAST_OSMOVTY_NODE + 1,
-	TRUNK_NODE,
+	TRUNK_NODE_E1,
 };
diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c
index 2f862f1..683d2ed 100644
--- a/src/libosmo-mgcp/mgcp_vty.c
+++ b/src/libosmo-mgcp/mgcp_vty.c
@@ -49,9 +49,9 @@
 	1,
 };
 
-struct cmd_node trunk_node = {
-	TRUNK_NODE,
-	"%s(config-mgcp-trunk)# ",
+struct cmd_node trunk_node_e1 = {
+	TRUNK_NODE_E1,
+	"%s(config-mgcp-trunk-e1)# ",
 	1,
 };
 
@@ -855,7 +855,7 @@
 		 "IPv4 Address of the callagent\n")
 
 DEFUN(cfg_mgcp_trunk, cfg_mgcp_trunk_cmd,
-      "trunk <1-64>", "Configure a SS7 trunk\n" "Trunk Nr\n")
+      "trunk-e1 <1-64>", "Configure a E1 trunk\n" "Trunk Nr\n")
 {
 	struct mgcp_trunk *trunk;
 	int index = atoi(argv[0]);
@@ -875,12 +875,12 @@
 		}
 	}
 
-	vty->node = TRUNK_NODE;
+	vty->node = TRUNK_NODE_E1;
 	vty->index = trunk;
 	return CMD_SUCCESS;
 }
 
-static int config_write_trunk(struct vty *vty)
+static int config_write_trunk_e1(struct vty *vty)
 {
 	struct mgcp_trunk *trunk;
 
@@ -894,7 +894,7 @@
 		if (trunk->trunk_nr == MGCP_VIRT_TRUNK_ID)
 			continue;
 
-		vty_out(vty, " trunk %d%s", trunk->trunk_nr, VTY_NEWLINE);
+		vty_out(vty, " trunk-e1 %d%s", trunk->trunk_nr, VTY_NEWLINE);
 		vty_out(vty, "  %ssdp audio-payload send-ptime%s",
 			trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE);
 		vty_out(vty, "  %ssdp audio-payload send-name%s",
@@ -1525,31 +1525,31 @@
 	install_element(MGCP_NODE, &cfg_mgcp_conn_timeout_cmd);
 
 	install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd);
-	install_node(&trunk_node, config_write_trunk);
-	install_element(TRUNK_NODE, &cfg_trunk_rtp_keepalive_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_rtp_keepalive_once_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_rtp_keepalive_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_payload_name_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd_old);
-	install_element(TRUNK_NODE, &cfg_trunk_payload_name_cmd_old);
-	install_element(TRUNK_NODE, &cfg_trunk_loop_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_omit_rtcp_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_omit_rtcp_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ssrc_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ssrc_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ts_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_rfc5993hr_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ts_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_sdp_fmtp_extra_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_sdp_payload_send_ptime_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_sdp_payload_send_ptime_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_sdp_payload_send_name_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_sdp_payload_send_name_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_allow_transcoding_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_allow_transcoding_cmd);
+	install_node(&trunk_node_e1, config_write_trunk_e1);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_rtp_keepalive_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_rtp_keepalive_once_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_rtp_keepalive_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_payload_number_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_payload_name_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_payload_number_cmd_old);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_payload_name_cmd_old);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_loop_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_omit_rtcp_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_omit_rtcp_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_ssrc_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_ssrc_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_ts_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_rfc5993hr_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_ts_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_fmtp_extra_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_payload_send_ptime_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_sdp_payload_send_ptime_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_payload_send_name_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_sdp_payload_send_name_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_allow_transcoding_cmd);
+	install_element(TRUNK_NODE_E1, &cfg_trunk_no_allow_transcoding_cmd);
 
 	return 0;
 }
diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c
index 99e2499..5d50278 100644
--- a/src/osmo-mgw/mgw_main.c
+++ b/src/osmo-mgw/mgw_main.c
@@ -224,7 +224,7 @@
 int mgcp_vty_go_parent(struct vty *vty)
 {
 	switch (vty->node) {
-	case TRUNK_NODE:
+	case TRUNK_NODE_E1:
 		vty->node = MGCP_NODE;
 		vty->index = NULL;
 		break;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e
Gerrit-Change-Number: 19103
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200702/a6311092/attachment.htm>

More information about the gerrit-log mailing list