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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: Fix yet another DSCP vs. TOS mix-up<br><br>This is a follow-up to I64fee56b04d0ecd128bf661699d5071817ea96ec,<br>due to code duplication there was another code path that manually set<br>the IP_TOS socekt option that I missed in the first patch.<br><br>Related: OS#5136<br>Change-Id: I4bb22d0f67984077706b694eb7e75327b41b6fcf<br>---<br>M src/gb/gprs_ns2_udp.c<br>1 file changed, 5 insertions(+), 3 deletions(-)<br><br></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 eb7d37b..22d371f 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -514,16 +514,18 @@</span><br><span>     struct priv_bind *priv;</span><br><span>      int rc = 0;</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>    OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));</span><br><span>      priv = bind->priv;</span><br><span> </span><br><span>    if (dscp != priv->dscp) {</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 style="color: hsl(0, 100%, 40%);">-                        LOGBIND(bind, LOGL_ERROR, "Failed to set the DSCP to %d with ret(%d) errno(%d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                  LOGBIND(bind, LOGL_ERROR, "Failed to set the DSCP to %u with ret(%d) errno(%d)\n",</span><br><span>                                 dscp, rc, errno);</span><br><span>            }</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23968">change 23968</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/+/23968"/><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: I4bb22d0f67984077706b694eb7e75327b41b6fcf </div>
<div style="display:none"> Gerrit-Change-Number: 23968 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>