<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19103">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_vty: be more specific about E1 trunks<br><br>Currently only E1 trunks can be crated using the node "trunk". However,<br>should we ever introduce another trunk type we will not be able to<br>distinguish the new trunk type. Lets rename "trunk" to "trunk-e1" along<br>with its underlying constants and function names so that we can easily<br>add another "trunk-t1" for example without making old configs<br>incompatible with the old concept.<br><br>Related: OS#2659<br>Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e<br>---<br>M include/osmocom/mgcp/vty.h<br>M src/libosmo-mgcp/mgcp_vty.c<br>M src/osmo-mgw/mgw_main.c<br>3 files changed, 34 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/19103/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/vty.h b/include/osmocom/mgcp/vty.h</span><br><span>index bf6b7a8..3d7ddb1 100644</span><br><span>--- a/include/osmocom/mgcp/vty.h</span><br><span>+++ b/include/osmocom/mgcp/vty.h</span><br><span>@@ -4,5 +4,5 @@</span><br><span> </span><br><span> enum mgcp_vty_node {</span><br><span> MGCP_NODE = _LAST_OSMOVTY_NODE + 1,</span><br><span style="color: hsl(0, 100%, 40%);">- TRUNK_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ TRUNK_NODE_E1,</span><br><span> };</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index 2f862f1..683d2ed 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -49,9 +49,9 @@</span><br><span> 1,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct cmd_node trunk_node = {</span><br><span style="color: hsl(0, 100%, 40%);">- TRUNK_NODE,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s(config-mgcp-trunk)# ",</span><br><span style="color: hsl(120, 100%, 40%);">+struct cmd_node trunk_node_e1 = {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRUNK_NODE_E1,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(config-mgcp-trunk-e1)# ",</span><br><span> 1,</span><br><span> };</span><br><span> </span><br><span>@@ -855,7 +855,7 @@</span><br><span> "IPv4 Address of the callagent\n")</span><br><span> </span><br><span> DEFUN(cfg_mgcp_trunk, cfg_mgcp_trunk_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "trunk <1-64>", "Configure a SS7 trunk\n" "Trunk Nr\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "trunk-e1 <1-64>", "Configure a E1 trunk\n" "Trunk Nr\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk;</span><br><span> int index = atoi(argv[0]);</span><br><span>@@ -875,12 +875,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = TRUNK_NODE;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->node = TRUNK_NODE_E1;</span><br><span> vty->index = trunk;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int config_write_trunk(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+static int config_write_trunk_e1(struct vty *vty)</span><br><span> {</span><br><span> struct mgcp_trunk *trunk;</span><br><span> </span><br><span>@@ -894,7 +894,7 @@</span><br><span> if (trunk->trunk_nr == MGCP_VIRT_TRUNK_ID)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " trunk %d%s", trunk->trunk_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " trunk-e1 %d%s", trunk->trunk_nr, VTY_NEWLINE);</span><br><span> vty_out(vty, " %ssdp audio-payload send-ptime%s",</span><br><span> trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE);</span><br><span> vty_out(vty, " %ssdp audio-payload send-name%s",</span><br><span>@@ -1525,31 +1525,31 @@</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_conn_timeout_cmd);</span><br><span> </span><br><span> install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_node(&trunk_node, config_write_trunk);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_rtp_keepalive_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_rtp_keepalive_once_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_rtp_keepalive_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_payload_name_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd_old);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_payload_name_cmd_old);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_loop_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_omit_rtcp_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_omit_rtcp_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ssrc_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ssrc_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ts_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_rfc5993hr_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ts_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_sdp_fmtp_extra_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_sdp_payload_send_ptime_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_sdp_payload_send_ptime_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_sdp_payload_send_name_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_sdp_payload_send_name_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_allow_transcoding_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(TRUNK_NODE, &cfg_trunk_no_allow_transcoding_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&trunk_node_e1, config_write_trunk_e1);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_rtp_keepalive_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_rtp_keepalive_once_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_rtp_keepalive_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_payload_number_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_payload_name_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_payload_number_cmd_old);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_payload_name_cmd_old);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_loop_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_omit_rtcp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_omit_rtcp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_ssrc_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_ssrc_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_ts_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_rfc5993hr_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_ts_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_fmtp_extra_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_payload_send_ptime_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_sdp_payload_send_ptime_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_payload_send_name_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_sdp_payload_send_name_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_allow_transcoding_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRUNK_NODE_E1, &cfg_trunk_no_allow_transcoding_cmd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c</span><br><span>index 99e2499..5d50278 100644</span><br><span>--- a/src/osmo-mgw/mgw_main.c</span><br><span>+++ b/src/osmo-mgw/mgw_main.c</span><br><span>@@ -224,7 +224,7 @@</span><br><span> int mgcp_vty_go_parent(struct vty *vty)</span><br><span> {</span><br><span> switch (vty->node) {</span><br><span style="color: hsl(0, 100%, 40%);">- case TRUNK_NODE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case TRUNK_NODE_E1:</span><br><span> vty->node = MGCP_NODE;</span><br><span> vty->index = NULL;</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19103">change 19103</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-mgw/+/19103"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e </div>
<div style="display:none"> Gerrit-Change-Number: 19103 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>