<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9260">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: clean up rtp port-range command<br><br>The VTY command that sets the RTP port range does not check if the data<br>entered by the user actually makes sens. Also it allwos to configur a<br>range that starts at 0.<br><br>- Make sure 0 can not be used as start or end of the range<br>- make sure the end port number is always greater then the begin<br> port number<br>- Autocorrect uneaven port range beginnings to one port number before to<br> ensure the range starts at an even port number<br>- Autocorrect even port range ends to the next odd port number to<br> ensure the range ends at an odd port number.<br><br>Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7<br>Related: OS#2825<br>---<br>M src/libosmo-mgcp/mgcp_vty.c<br>1 file changed, 29 insertions(+), 9 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 392a176..3c1b596 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -282,13 +282,6 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void parse_range(struct mgcp_port_range *range, const char **argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- range->range_start = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- range->range_end = atoi(argv[1]);</span><br><span style="color: hsl(0, 100%, 40%);">- range->last_port = g_cfg->net_ports.range_start;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define RTP_STR "RTP configuration\n"</span><br><span> #define UDP_PORT_STR "UDP Port number\n"</span><br><span> #define NET_START_STR "First UDP port allocated\n"</span><br><span>@@ -297,11 +290,38 @@</span><br><span> </span><br><span> DEFUN(cfg_mgcp_rtp_port_range,</span><br><span> cfg_mgcp_rtp_port_range_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp port-range <0-65534> <0-65534>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp port-range <1024-65534> <1025-65535>",</span><br><span> RTP_STR "Range of ports to use for the NET side\n"</span><br><span> RANGE_START_STR RANGE_END_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- parse_range(&g_cfg->net_ports, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+ int start;</span><br><span style="color: hsl(120, 100%, 40%);">+ int end;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ start = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ end = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (end < start) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "range end port (%i) must be greater than the range start port (%i)!%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ end, start, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (start & 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "range must begin at an even port number, autocorrecting port (%i) to: %i%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ start, start & 0xFFFE, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ start &= 0xFFFE;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((end & 1) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "range must end at an odd port number, autocorrecting port (%i) to: %i%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ end, end | 1, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ end |= 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->net_ports.range_start = start;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->net_ports.range_end = end;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->net_ports.last_port = g_cfg->net_ports.range_start;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> ALIAS_DEPRECATED(cfg_mgcp_rtp_port_range,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9260">change 9260</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/9260"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 </div>
<div style="display:none"> Gerrit-Change-Number: 9260 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>