<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18593">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_vty: fix indentation in VTY config write<br><br>The config under the node mgcp is written with an indentation that has<br>one space too much.<br><br>Change-Id: I2aefeaf3d7ad4a98b7bfcdc7cbc1ce6ebcbe0537<br>Related: OS#2659<br>---<br>M src/libosmo-mgcp/mgcp_vty.c<br>1 file changed, 36 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index 137d5de..7278c1c 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -71,100 +71,100 @@</span><br><span> struct mgcp_trunk *trunk = g_cfg->virt_trunk;</span><br><span> </span><br><span> vty_out(vty, "mgcp%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " domain %s%s", g_cfg->domain, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " domain %s%s", g_cfg->domain, VTY_NEWLINE);</span><br><span> if (g_cfg->local_ip)</span><br><span> vty_out(vty, " local ip %s%s", g_cfg->local_ip, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " bind ip %s%s", g_cfg->source_addr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " bind port %u%s", g_cfg->source_port, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtp port-range %u %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bind ip %s%s", g_cfg->source_addr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bind port %u%s", g_cfg->source_port, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp port-range %u %u%s",</span><br><span> g_cfg->net_ports.range_start, g_cfg->net_ports.range_end,</span><br><span> VTY_NEWLINE);</span><br><span> if (g_cfg->net_ports.bind_addr)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtp bind-ip %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp bind-ip %s%s",</span><br><span> g_cfg->net_ports.bind_addr, VTY_NEWLINE);</span><br><span> if (g_cfg->net_ports.bind_addr_probe)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtp ip-probing%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp ip-probing%s", VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " no rtp ip-probing%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtp ip-dscp %d%s", g_cfg->endp_dscp, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " no rtp ip-probing%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp ip-dscp %d%s", g_cfg->endp_dscp, VTY_NEWLINE);</span><br><span> if (trunk->keepalive_interval == MGCP_KEEPALIVE_ONCE)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtp keep-alive once%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp keep-alive once%s", VTY_NEWLINE);</span><br><span> else if (trunk->keepalive_interval)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtp keep-alive %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp keep-alive %d%s",</span><br><span> trunk->keepalive_interval, VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE);</span><br><span> </span><br><span> if (trunk->omit_rtcp)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtcp-omit%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtcp-omit%s", VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " no rtcp-omit%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " no rtcp-omit%s", VTY_NEWLINE);</span><br><span> if (trunk->force_constant_ssrc</span><br><span> || trunk->force_aligned_timing</span><br><span> || trunk->rfc5993_hr_convert) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %srtp-patch ssrc%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %srtp-patch ssrc%s",</span><br><span> trunk->force_constant_ssrc ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %srtp-patch timestamp%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %srtp-patch timestamp%s",</span><br><span> trunk->force_aligned_timing ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %srtp-patch rfc5993hr%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %srtp-patch rfc5993hr%s",</span><br><span> trunk->rfc5993_hr_convert ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span> } else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " no rtp-patch%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " no rtp-patch%s", VTY_NEWLINE);</span><br><span> if (trunk->audio_payload != -1)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " sdp audio-payload number %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " sdp audio-payload number %d%s",</span><br><span> trunk->audio_payload, VTY_NEWLINE);</span><br><span> if (trunk->audio_name)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " sdp audio-payload name %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " sdp audio-payload name %s%s",</span><br><span> trunk->audio_name, VTY_NEWLINE);</span><br><span> if (trunk->audio_fmtp_extra)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " sdp audio fmtp-extra %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " sdp audio fmtp-extra %s%s",</span><br><span> trunk->audio_fmtp_extra, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %ssdp audio-payload send-ptime%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %ssdp audio-payload send-ptime%s",</span><br><span> trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %ssdp audio-payload send-name%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 style="color: hsl(0, 100%, 40%);">- vty_out(vty, " number endpoints %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " number endpoints %u%s",</span><br><span> trunk->vty_number_endpoints - 1, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %sallow-transcoding%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %sallow-transcoding%s",</span><br><span> trunk->no_audio_transcoding ? "no " : "", VTY_NEWLINE);</span><br><span> if (g_cfg->call_agent_addr)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " call-agent ip %s%s", g_cfg->call_agent_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " call-agent ip %s%s", g_cfg->call_agent_addr,</span><br><span> VTY_NEWLINE);</span><br><span> if (g_cfg->force_ptime > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rtp force-ptime %d%s", g_cfg->force_ptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp force-ptime %d%s", g_cfg->force_ptime,</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span> switch (g_cfg->osmux) {</span><br><span> case OSMUX_USAGE_ON:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux on%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux on%s", VTY_NEWLINE);</span><br><span> break;</span><br><span> case OSMUX_USAGE_ONLY:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux only%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux only%s", VTY_NEWLINE);</span><br><span> break;</span><br><span> case OSMUX_USAGE_OFF:</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux off%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux off%s", VTY_NEWLINE);</span><br><span> break;</span><br><span> }</span><br><span> if (g_cfg->osmux) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux bind-ip %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux bind-ip %s%s",</span><br><span> g_cfg->osmux_addr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux batch-factor %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux batch-factor %d%s",</span><br><span> g_cfg->osmux_batch, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux batch-size %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux batch-size %u%s",</span><br><span> g_cfg->osmux_batch_size, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux port %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux port %u%s",</span><br><span> g_cfg->osmux_port, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux dummy %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux dummy %s%s",</span><br><span> g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> if (g_cfg->conn_timeout)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " conn-timeout %u%s", g_cfg->conn_timeout, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " conn-timeout %u%s", g_cfg->conn_timeout, VTY_NEWLINE);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18593">change 18593</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/+/18593"/><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: I2aefeaf3d7ad4a98b7bfcdc7cbc1ce6ebcbe0537 </div>
<div style="display:none"> Gerrit-Change-Number: 18593 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>