<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23921">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Fix setting the DSCP value.<br><br>DSCP is a 6-bit value (0..63) stored in the upper 6 bits of what was<br>formerly known as TOS bits.  We must<br>* make sure the user can only specify 0..63<br>* shift the value by two bits when using the IP_TOS socket option<br><br>We achieve the latter by using the recently-added osmo_sock_set_dscp()<br>helper.<br><br>Change-Id: I64fee56b04d0ecd128bf661699d5071817ea96ec<br>Closes: OS#5136<br>---<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>2 files changed, 5 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/23921/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 8350ad8..eb7d37b 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -320,6 +320,9 @@</span><br><span>  if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6)</span><br><span>             return -EINVAL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   if (dscp < 0 || dscp > 63)</span><br><span style="color: hsl(120, 100%, 40%);">+              return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    bind = gprs_ns2_ip_bind_by_sockaddr(nsi, local);</span><br><span>     if (bind) {</span><br><span>          if (result)</span><br><span>@@ -361,8 +364,7 @@</span><br><span>    if (dscp > 0) {</span><br><span>           priv->dscp = dscp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-               rc = setsockopt(priv->fd.fd, IPPROTO_IP, IP_TOS,</span><br><span style="color: hsl(0, 100%, 40%);">-                             &dscp, sizeof(dscp));</span><br><span style="color: hsl(120, 100%, 40%);">+             rc = osmo_sock_set_dscp(priv->fd.fd, dscp);</span><br><span>               if (rc < 0)</span><br><span>                       LOGBIND(bind, LOGL_ERROR, "Failed to set the DSCP to %d with ret(%d) errno(%d)\n",</span><br><span>                                 dscp, rc, errno);</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 1ef22f5..c390423 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -679,7 +679,7 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_ns_bind_dscp, cfg_ns_bind_dscp_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-      "dscp <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+      "dscp <0-63>",</span><br><span>       "Set DSCP/TOS on the UDP socket\n" "DSCP Value\n")</span><br><span> {</span><br><span>   struct vty_bind *vbind = vty->index;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23921">change 23921</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/libosmocore/+/23921"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I64fee56b04d0ecd128bf661699d5071817ea96ec </div>
<div style="display:none"> Gerrit-Change-Number: 23921 </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>