<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23987">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce ability to set socket priority of RTP sockets<br><br>This significantly simplifies setups in which not only the IP DSCP<br>but also the IEEE 802.1Q PCP is to be set for RTP packets.<br><br>Change-Id: Ia3a91e6788285be3e2e73defee63e6bd79c6258e<br>Related: SYS#5427<br>---<br>M include/osmo-bts/bts.h<br>M src/common/bts.c<br>M src/common/rsl.c<br>M src/common/vty.c<br>4 files changed, 25 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/23987/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index be0222d..7a1085e 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -297,6 +297,7 @@</span><br><span> uint16_t rtp_port_range_end;</span><br><span> uint16_t rtp_port_range_next;</span><br><span> int rtp_ip_dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rtp_priority;</span><br><span> </span><br><span> struct {</span><br><span> uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 06a5ccb..3860a87 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -329,6 +329,7 @@</span><br><span> bts->rtp_port_range_end = 17407;</span><br><span> bts->rtp_port_range_next = bts->rtp_port_range_start;</span><br><span> bts->rtp_ip_dscp = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_priority = -1;</span><br><span> </span><br><span> /* Default (fall-back) MS/BS Power control parameters */</span><br><span> bts->bs_dpc_params = power_ctrl_params_def;</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 963e6ba..cd3fda5 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -2433,6 +2433,11 @@</span><br><span> LOGP(DRSL, LOGL_ERROR, "failed to set DSCP=%i: %s\n",</span><br><span> bts->rtp_ip_dscp, strerror(errno));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->rtp_priority != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_rtp_socket_set_priority(rs, bts->rtp_priority))</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_ERROR, "failed to set socket priority %d: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_priority, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 45ee32c..fb4ab94 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -300,6 +300,8 @@</span><br><span> bts->rtp_port_range_end, VTY_NEWLINE);</span><br><span> if (bts->rtp_ip_dscp != -1)</span><br><span> vty_out(vty, " rtp ip-dscp %i%s", bts->rtp_ip_dscp, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->rtp_priority != -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rtp socket-priority %i%s", bts->rtp_priority, 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>@@ -595,6 +597,21 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_bts_rtp_priority,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_rtp_priority_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BTS_VTY_ATTR_NEW_LCHAN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp socket-priority <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR "Specify socket priority for RTP/IP packets\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "The socket priority alue (> 6 requires CAP_NET_ADMIN)\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%);">+ int prio = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->rtp_priority = prio;</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_ATTR(cfg_bts_paging_queue_size,</span><br><span>@@ -2312,6 +2329,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_jitbuf_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_port_range_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_ip_dscp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_rtp_priority_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/c/osmo-bts/+/23987">change 23987</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-bts/+/23987"/><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-Change-Id: Ia3a91e6788285be3e2e73defee63e6bd79c6258e </div>
<div style="display:none"> Gerrit-Change-Number: 23987 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>