<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23975">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns: Fix another DSCP vs. TOS mistake in old NS code<br><br>DSCP is a 6-bit value stored in the upper 8 bit of what was used to<br>be known as TOS.  Let's use the newly introduced OSMO_SOCK_F_DSCP()<br>to prevent having to worry about this in higher level code.<br><br>Change-Id: I6b9848fd0752d99d3df5346313618d5847d64fb8<br>Related: OS#5136<br>---<br>M src/gb/gprs_ns.c<br>1 file changed, 4 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/23975/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index a6ef6d4..f486333 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -2068,7 +2068,8 @@</span><br><span>                  osmo_sock_init2_ofd(&nsi->nsip.fd, AF_INET, SOCK_DGRAM,</span><br><span>                                   IPPROTO_UDP, inet_ntoa(in),</span><br><span>                                  nsi->nsip.local_port, remote_str,</span><br><span style="color: hsl(0, 100%, 40%);">-                                    nsi->nsip.remote_port, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+                                    nsi->nsip.remote_port, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT |</span><br><span style="color: hsl(120, 100%, 40%);">+                                    OSMO_SOCK_F_BIND | OSMO_SOCK_F_DSCP(nsi->nsip.dscp));</span><br><span> </span><br><span>                 LOGP(DNS, LOGL_NOTICE,</span><br><span>                    "Listening for nsip packets from %s:%u on %s:%u\n",</span><br><span>@@ -2076,7 +2077,8 @@</span><br><span>   } else {</span><br><span>             /* Accept UDP packets from any source IP/Port */</span><br><span>             ret = osmo_sock_init_ofd(&nsi->nsip.fd, AF_INET, SOCK_DGRAM,</span><br><span style="color: hsl(0, 100%, 40%);">-                                      IPPROTO_UDP, inet_ntoa(in), nsi->nsip.local_port, OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(120, 100%, 40%);">+                                       IPPROTO_UDP, inet_ntoa(in), nsi->nsip.local_port,</span><br><span style="color: hsl(120, 100%, 40%);">+                                  OSMO_SOCK_F_BIND | OSMO_SOCK_F_DSCP(nsi->nsip.dscp));</span><br><span> </span><br><span>                LOGP(DNS, LOGL_NOTICE, "Listening for nsip packets on %s:%u\n", inet_ntoa(in), nsi->nsip.local_port);</span><br><span>   }</span><br><span>@@ -2087,13 +2089,6 @@</span><br><span>           return ret;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   ret = setsockopt(nsi->nsip.fd.fd, IPPROTO_IP, IP_TOS,</span><br><span style="color: hsl(0, 100%, 40%);">-                                &nsi->nsip.dscp, sizeof(nsi->nsip.dscp));</span><br><span style="color: hsl(0, 100%, 40%);">-     if (ret < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-         LOGP(DNS, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                   "Failed to set the DSCP to %d with ret(%d) errno(%d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                      nsi->nsip.dscp, ret, errno);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>      LOGP(DNS, LOGL_NOTICE, "NS UDP socket at %s:%d\n", inet_ntoa(in), nsi->nsip.local_port);</span><br><span> </span><br><span>    return ret;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23975">change 23975</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/+/23975"/><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: I6b9848fd0752d99d3df5346313618d5847d64fb8 </div>
<div style="display:none"> Gerrit-Change-Number: 23975 </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>