<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23974">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: migrate from osmo_sock_set_dscp() to OSMO_SOCK_F_DSCP()<br><br>The latter is much more compact than the former.<br><br>Change-Id: I2a24c0cbb17fad8ed84297267dcd63730efbc014<br>---<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_udp.c<br>2 files changed, 4 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index f888af2..9391343 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -589,25 +589,16 @@</span><br><span> priv->fd.data = bind;</span><br><span> priv->addr = *local;</span><br><span> INIT_LLIST_HEAD(&bind->nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->dscp = dscp;</span><br><span> </span><br><span> rc = osmo_sock_init_osa_ofd(&priv->fd, SOCK_RAW, IPPROTO_GRE,</span><br><span> local, NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCK_F_BIND | OSMO_SOCK_F_DSCP(priv->dscp));</span><br><span> if (rc < 0) {</span><br><span> gprs_ns2_free_bind(bind);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (dscp > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- priv->dscp = dscp;</span><br><span style="color: hsl(0, 100%, 40%);">-</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(0, 100%, 40%);">- 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(0, 100%, 40%);">- dscp, rc, errno);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (result)</span><br><span> *result = bind;</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 22d371f..0de207c 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -352,24 +352,16 @@</span><br><span> priv->fd.cb = nsip_fd_cb;</span><br><span> priv->fd.data = bind;</span><br><span> priv->addr = *local;</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->dscp = dscp;</span><br><span> </span><br><span> rc = osmo_sock_init_osa_ofd(&priv->fd, SOCK_DGRAM, IPPROTO_UDP,</span><br><span> local, NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SOCK_F_BIND);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCK_F_BIND | OSMO_SOCK_F_DSCP(priv->dscp));</span><br><span> if (rc < 0) {</span><br><span> gprs_ns2_free_bind(bind);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (dscp > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- priv->dscp = dscp;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_sock_set_dscp(priv->fd.fd, dscp);</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- dscp, rc, errno);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* IPv4: max fragmented payload can be (13 bit) * 8 byte => 65535.</span><br><span> * IPv6: max payload can be 65535 (RFC 2460).</span><br><span> * UDP header = 8 byte */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23974">change 23974</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/+/23974"/><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: I2a24c0cbb17fad8ed84297267dcd63730efbc014 </div>
<div style="display:none"> Gerrit-Change-Number: 23974 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>