<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17401">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl: make IP DSCP configurable<br><br>Related: OS#4438<br>Depends: libosmo-abis I41603db8c1286660ad57ac1c78a8fb393a2b080b<br>Change-Id: Icdef5d40243fefdeae23f3bcf9c6702e8487928a<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, 27 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 e0d70b0..3316670 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>@@ -741,6 +741,7 @@</span><br><span>      uint16_t rtp_port_range_start;</span><br><span>       uint16_t rtp_port_range_end;</span><br><span>         uint16_t rtp_port_range_next;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rtp_ip_dscp;</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 da41176..2200615 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -159,6 +159,7 @@</span><br><span>       bts->rtp_port_range_start = 16384;</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 style="color: hsl(120, 100%, 40%);">+   bts->rtp_ip_dscp = -1;</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 10fb95e..41dd243 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -2009,8 +2009,15 @@</span><br><span> </span><br><span>           bts->rtp_port_range_next += 2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           if (rc == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                    return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+             if (rc != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                  continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           if (bts->rtp_ip_dscp != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      if (osmo_rtp_socket_set_dscp(rs, bts->rtp_ip_dscp))</span><br><span style="color: hsl(120, 100%, 40%);">+                                LOGP(DRSL, LOGL_ERROR, "failed to set DSCP=%i: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                                       bts->rtp_ip_dscp, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span style="color: hsl(120, 100%, 40%);">+             return 0;</span><br><span>    }</span><br><span> </span><br><span>        return -1;</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index c03f0d4..ab38dc1 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -237,6 +237,8 @@</span><br><span>        vty_out(vty, "%s", VTY_NEWLINE);</span><br><span>   vty_out(vty, " rtp port-range %u %u%s", bts->rtp_port_range_start,</span><br><span>              bts->rtp_port_range_end, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (bts->rtp_ip_dscp != -1)</span><br><span style="color: hsl(120, 100%, 40%);">+                vty_out(vty, " rtp ip-dscp %i%s", bts->rtp_ip_dscp, 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>@@ -501,6 +503,19 @@</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_ip_dscp,</span><br><span style="color: hsl(120, 100%, 40%);">+      cfg_bts_rtp_ip_dscp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+      "rtp ip-dscp <0-63>",</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_STR "Specify DSCP for RTP/IP packets\n" "The DSCP value (upper 6 bits of TOS)\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 dscp = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   bts->rtp_ip_dscp = dscp;</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>@@ -1665,6 +1680,7 @@</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>      install_element(BTS_NODE, &cfg_bts_rtp_port_range_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+   install_element(BTS_NODE, &cfg_bts_rtp_ip_dscp_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/+/17401">change 17401</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/+/17401"/><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: Icdef5d40243fefdeae23f3bcf9c6702e8487928a </div>
<div style="display:none"> Gerrit-Change-Number: 17401 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>