<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20247">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_vty: remove remains of loopback functionality<br><br>There exist trunk_loop commands, which sets an trunk->audio_loop<br>variable, however all it does is to turn on a log message. There is no<br>actual implementation present. Lets set the VTY commands to<br>DEFUN_DEPRECATED and remove the variable.<br><br>Change-Id: I72b0f8b908e32643e6e3db6ac024371b13c074a1<br>---<br>M include/osmocom/mgcp/mgcp_trunk.h<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>3 files changed, 8 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/47/20247/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h</span><br><span>index 1002adb..8127181 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_trunk.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_trunk.h</span><br><span>@@ -24,7 +24,6 @@</span><br><span> char *audio_fmtp_extra;</span><br><span> int audio_send_ptime;</span><br><span> int audio_send_name;</span><br><span style="color: hsl(0, 100%, 40%);">- int audio_loop;</span><br><span> </span><br><span> int no_audio_transcoding;</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index fa40f1f..b452201 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -893,10 +893,6 @@</span><br><span> LOGPENDP(endp, DRTP, LOGL_DEBUG, "delivering RTCP packet...\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPENDP(endp, DRTP, LOGL_DEBUG, "loop:%d, mode:%d%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->audio_loop, conn_src->conn->mode,</span><br><span style="color: hsl(0, 100%, 40%);">- conn_src->conn->mode == MGCP_CONN_LOOPBACK ? " (loopback)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* FIXME: It is legal that the payload type on the egress connection is</span><br><span> * different from the payload type that has been negotiated on the</span><br><span> * ingress connection. Essentially the codecs are the same so we can</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index aa27d41..cc7c5b8 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -115,7 +115,6 @@</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> trunk->audio_send_name ? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE);</span><br><span> vty_out(vty, " number endpoints %u%s",</span><br><span> trunk->v.vty_number_endpoints, VTY_NEWLINE);</span><br><span> vty_out(vty, " %sallow-transcoding%s",</span><br><span>@@ -712,18 +711,11 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_mgcp_loop,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_mgcp_loop_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "loop (0|1)",</span><br><span style="color: hsl(0, 100%, 40%);">- "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_mgcp_loop,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_loop_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "loop (0|1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(trunk);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->osmux) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->audio_loop = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -947,7 +939,6 @@</span><br><span> trunk->keepalive_interval, VTY_NEWLINE);</span><br><span> else</span><br><span> vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " loop %d%s", trunk->audio_loop, VTY_NEWLINE);</span><br><span> vty_out(vty, " force-realloc %d%s",</span><br><span> trunk->force_realloc, VTY_NEWLINE);</span><br><span> vty_out(vty, " rtp-accept-all %d%s",</span><br><span>@@ -1019,18 +1010,11 @@</span><br><span> "sdp audio payload name NAME",</span><br><span> SDP_STR AUDIO_STR AUDIO_STR "Payload\n" "Payload Name\n")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_trunk_loop,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trunk_loop_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "loop (0|1)",</span><br><span style="color: hsl(0, 100%, 40%);">- "Loop audio for all endpoints on this trunk\n" "Don't Loop\n" "Loop\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_trunk_loop,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trunk_loop_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "loop (0|1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Loop audio for all endpoints on this trunk\n" "Don't Loop\n" "Loop\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk *trunk = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->osmux) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->audio_loop = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -1445,11 +1429,6 @@</span><br><span> else if (strcmp(argv[0], "only") == 0)</span><br><span> g_cfg->osmux = OSMUX_USAGE_ONLY;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (trunk->audio_loop) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return CMD_SUCCESS;</span><br><span> </span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20247">change 20247</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/+/20247"/><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: I72b0f8b908e32643e6e3db6ac024371b13c074a1 </div>
<div style="display:none"> Gerrit-Change-Number: 20247 </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>