<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9261">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;">rtp: make port range configurable, assign correct port numbers<br><br>The current implementation does not allow the user to specify a port<br>range in which the BTS is allowed to allocate a local RTP port. Also<br>the ports the BTS picks do not match the policy described in RFC3550.<br>An RTP Port must be at an even port number and the matching RTCP<br>port must be at the following (odd) port number. The BTS currently<br>picks random port numbers for both.<br><br>- Add a VTY command to specify a port range in which the BTS may<br> assign local ports.<br><br>- Pick ports as described in RFC3550.<br><br>Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87<br>Related: OS#2825 OS#2635<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/bts.c<br>M src/common/rsl.c<br>M src/common/vty.c<br>4 files changed, 72 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index 81cac3e..f4fb766 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -688,6 +688,11 @@</span><br><span> struct llist_head oml_queue;</span><br><span> unsigned int rtp_jitter_buf_ms;</span><br><span> bool rtp_jitter_adaptive;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t rtp_port_range_start;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t rtp_port_range_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t rtp_port_range_next;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct {</span><br><span> uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */</span><br><span> } support;</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 74630cc..54e5480 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -135,6 +135,9 @@</span><br><span> bts->paging_state = paging_init(bts, 200, 0);</span><br><span> bts->ul_power_target = -75; /* dBm default */</span><br><span> bts->rtp_jitter_adaptive = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_start = 16384;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_end = 17407;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_next = bts->rtp_port_range_start;</span><br><span> </span><br><span> /* configurable via OML */</span><br><span> bts->load.ccch.load_ind_period = 112;</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 5dd2c59..b5d0c2b 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1787,6 +1787,29 @@</span><br><span> return hostbuf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int bind_rtp(struct gsm_bts *bts, struct osmo_rtp_socket *rs, const char *ip)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tries;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tries = (bts->rtp_port_range_end - bts->rtp_port_range_start) / 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < tries; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->rtp_port_range_next >= bts->rtp_port_range_end)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_next = bts->rtp_port_range_start;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_rtp_socket_bind(rs, ip, bts->rtp_port_range_next);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_next += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int rsl_rx_ipac_XXcx(struct msgb *msg)</span><br><span> {</span><br><span> struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);</span><br><span>@@ -1907,8 +1930,7 @@</span><br><span> * back to the BSC in the CRCX_ACK */</span><br><span> ipstr = get_rsl_local_ip(lchan->ts->trx);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_rtp_socket_bind(lchan->abis_ip.rtp_socket,</span><br><span style="color: hsl(0, 100%, 40%);">- ipstr, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bind_rtp(bts, lchan->abis_ip.rtp_socket, ipstr);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DRTP, LOGL_ERROR,</span><br><span> "%s IPAC Failed to bind RTP/RTCP sockets\n",</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 2716a7a..6061335 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -262,6 +262,8 @@</span><br><span> if (bts->rtp_jitter_adaptive)</span><br><span> vty_out(vty, " adaptive");</span><br><span> vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp port-range %u %u%s", bts->rtp_port_range_start,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_end, VTY_NEWLINE);</span><br><span> vty_out(vty, " paging queue-size %u%s", paging_get_queue_max(bts->paging_state),</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " paging lifetime %u%s", paging_get_lifetime(bts->paging_state),</span><br><span>@@ -486,6 +488,43 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bts_rtp_port_range,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rtp_port_range_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp port-range <1-65534> <1-65534>",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR "Range of local ports to use for RTP/RTCP traffic\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int start;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned 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 (%u) must be greater than the range start port (%u)!%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! (%u not even)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 ((end & 1) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "range must end at an odd port number! (%u not odd)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ end, 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%);">+ bts->rtp_port_range_start = start;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_end = end;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_port_range_next = bts->rtp_port_range_start;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define PAG_STR "Paging related parameters\n"</span><br><span> </span><br><span> DEFUN(cfg_bts_paging_queue_size,</span><br><span>@@ -1554,6 +1593,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_oml_ip_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_bind_ip_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_jitbuf_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rtp_port_range_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_band_cmd);</span><br><span> install_element(BTS_NODE, &cfg_description_cmd);</span><br><span> install_element(BTS_NODE, &cfg_no_description_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9261">change 9261</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/9261"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 </div>
<div style="display:none"> Gerrit-Change-Number: 9261 </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: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>