<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23976">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Allow setting the socket priority for a UDP bind<br><br>Change-Id: Ifdfa086ce1c8d62b256abb3454b70cf53da9dcdb<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>M src/gb/libosmogb.map<br>4 files changed, 54 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/23976/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h</span><br><span>index be59a67..a9c144c 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -246,6 +246,7 @@</span><br><span> const struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind);</span><br><span> int gprs_ns2_is_ip_bind(struct gprs_ns2_vc_bind *bind);</span><br><span> int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp);</span><br><span style="color: hsl(120, 100%, 40%);">+int gprs_ns2_ip_bind_set_priority(struct gprs_ns2_vc_bind *bind, uint8_t priority);</span><br><span> struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(</span><br><span> struct gprs_ns2_vc_bind *bind,</span><br><span> const struct osmo_sockaddr *saddr);</span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 0de207c..7980df5 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -49,6 +49,7 @@</span><br><span> struct osmo_fd fd;</span><br><span> struct osmo_sockaddr addr;</span><br><span> int dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t priority;</span><br><span> };</span><br><span> </span><br><span> struct priv_vc {</span><br><span>@@ -103,7 +104,8 @@</span><br><span> nsvcs++;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "UDP bind: %s:%d DSCP: %d%s", sockstr.ip, sockstr.port, priv->dscp, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "UDP bind: %s:%d DSCP: %d Priority: %u%s", sockstr.ip, sockstr.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->dscp, priv->priority, VTY_NEWLINE);</span><br><span> vty_out(vty, " IP-SNS signalling weight: %u data weight: %u%s",</span><br><span> bind->sns_sig_weight, bind->sns_data_weight, VTY_NEWLINE);</span><br><span> vty_out(vty, " %lu NS-VC:%s", nsvcs, VTY_NEWLINE);</span><br><span>@@ -525,6 +527,29 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Set the socket priority of the given bind. */</span><br><span style="color: hsl(120, 100%, 40%);">+int gprs_ns2_ip_bind_set_priority(struct gprs_ns2_vc_bind *bind, uint8_t priority)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct priv_bind *priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));</span><br><span style="color: hsl(120, 100%, 40%);">+ priv = bind->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priority != priv->priority) {</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->priority = priority;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_set_priority(priv->fd.fd, priority);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGBIND(bind, LOGL_ERROR, "Failed to set the priority to %u with ret(%d) errno(%d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ priority, rc, errno);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Count UDP binds compatible with remote */</span><br><span> int ns2_ip_count_bind(struct gprs_ns2_inst *nsi, struct osmo_sockaddr *remote)</span><br><span> {</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index c390423..0fd7c17 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -67,6 +67,7 @@</span><br><span> const char *name;</span><br><span> enum gprs_ns2_ll ll;</span><br><span> int dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t priority;</span><br><span> bool accept_ipaccess;</span><br><span> bool accept_sns;</span><br><span> uint8_t ip_sns_sig_weight;</span><br><span>@@ -468,6 +469,8 @@</span><br><span> vty_out(vty, " accept-dynamic-ip-sns%s", VTY_NEWLINE);</span><br><span> if (vbind->dscp)</span><br><span> vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vbind->priority)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " priority %u%s", vbind->priority, VTY_NEWLINE);</span><br><span> vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s",</span><br><span> vbind->ip_sns_sig_weight, vbind->ip_sns_data_weight, VTY_NEWLINE);</span><br><span> break;</span><br><span>@@ -722,6 +725,28 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ns_bind_priority, cfg_ns_bind_priority_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "priority <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set socket priority on the UDP socket\n" "Priority Value (>6 requires CAP_NET_ADMIN)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty_bind *vbind = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc_bind *bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t prio = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vbind->ll != GPRS_NS2_LL_UDP) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "dscp can be only used with UDP bind%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vbind->priority = prio;</span><br><span style="color: hsl(120, 100%, 40%);">+ bind = gprs_ns2_bind_by_name(vty_nsi, vbind->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind)</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_ip_bind_set_priority(bind, prio);</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> DEFUN(cfg_ns_bind_ipaccess, cfg_ns_bind_ipaccess_cmd,</span><br><span> "accept-ipaccess",</span><br><span> "Allow to create dynamic NS Entity by NS Reset PDU on UDP (ip.access style)\n"</span><br><span>@@ -2235,6 +2260,7 @@</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_listen_cmd);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_dscp_cmd);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_dscp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_priority_cmd);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_ip_sns_weight_cmd);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_ipaccess_cmd);</span><br><span> install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_ipaccess_cmd);</span><br><span>diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map</span><br><span>index ed9b822..db638f9 100644</span><br><span>--- a/src/gb/libosmogb.map</span><br><span>+++ b/src/gb/libosmogb.map</span><br><span>@@ -162,6 +162,7 @@</span><br><span> gprs_ns2_ip_bind;</span><br><span> gprs_ns2_ip_bind_by_sockaddr;</span><br><span> gprs_ns2_ip_bind_set_dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+gprs_ns2_ip_bind_set_priority;</span><br><span> gprs_ns2_ip_bind_set_sns_weight;</span><br><span> gprs_ns2_ip_bind_sockaddr;</span><br><span> gprs_ns2_ip_connect;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23976">change 23976</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/+/23976"/><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: Ifdfa086ce1c8d62b256abb3454b70cf53da9dcdb </div>
<div style="display:none"> Gerrit-Change-Number: 23976 </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>