<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22868">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: add signalling & data weights for UDP binds<br><br>Allow to assign a signalling and data weight to UDP binds.<br>Those weights will be used when doing dynamic configuration over<br>IP-SNS.<br>This is only the first part which only uses the assigned weights<br>when doing a new SNS configuration.<br>The outgoing change weight procedure will be supported in a later patch<br>when the SNS fsm supports outgoing procedures.<br><br>Related: SYS#5354<br>Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_sns.c<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>M src/gb/libosmogb.map<br>M tests/gb/gprs_ns2_vty.vty<br>8 files changed, 74 insertions(+), 4 deletions(-)<br><br></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 1bf8c7f..07e6c45 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -215,6 +215,8 @@</span><br><span> const struct osmo_sockaddr *remote,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span> uint16_t nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t signalling, uint8_t data);</span><br><span> </span><br><span> void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind);</span><br><span> void gprs_ns2_free_binds(struct gprs_ns2_inst *nsi);</span><br><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index ca47934..99a7415 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -1409,6 +1409,8 @@</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bind->sns_sig_weight = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->sns_data_weight = 1;</span><br><span> bind->nsi = nsi;</span><br><span> INIT_LLIST_HEAD(&bind->nsvc);</span><br><span> llist_add(&bind->list, &nsi->binding);</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index ff95c81..88e352a 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -257,6 +257,11 @@</span><br><span> void (*dump_vty)(const struct gprs_ns2_vc_bind *bind,</span><br><span> struct vty *vty, bool stats);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /*! the IP-SNS signalling weight when doing dynamic configuration */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sns_sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! the IP-SNS data weight when doing dynamic configuration */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sns_data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_stat_item_group *statg;</span><br><span> };</span><br><span> </span><br><span>@@ -352,6 +357,7 @@</span><br><span> const char *id);</span><br><span> void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc);</span><br><span> void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive);</span><br><span style="color: hsl(120, 100%, 40%);">+void ns2_sns_update_weights(struct gprs_ns2_vc_bind *bind);</span><br><span> </span><br><span> /* vc */</span><br><span> struct osmo_fsm_inst *ns2_vc_fsm_alloc(struct gprs_ns2_vc *nsvc,</span><br><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 7b28754..d061eed 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -796,8 +796,8 @@</span><br><span> }</span><br><span> </span><br><span> ip4_elems->udp_port = sa->u.sin.sin_port;</span><br><span style="color: hsl(0, 100%, 40%);">- ip4_elems->sig_weight = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- ip4_elems->data_weight = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip4_elems->sig_weight = bind->sns_sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip4_elems->data_weight = bind->sns_data_weight;</span><br><span> ip4_elems++;</span><br><span> }</span><br><span> </span><br><span>@@ -835,8 +835,8 @@</span><br><span> }</span><br><span> </span><br><span> ip6_elems->udp_port = sa->u.sin.sin_port;</span><br><span style="color: hsl(0, 100%, 40%);">- ip6_elems->sig_weight = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- ip6_elems->data_weight = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip6_elems->sig_weight = bind->sns_sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip6_elems->data_weight = bind->sns_data_weight;</span><br><span> </span><br><span> ip6_elems++;</span><br><span> }</span><br><span>@@ -1810,6 +1810,14 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Update SNS weights</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nsvc the NSVC which should be updated</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void ns2_sns_update_weights(struct gprs_ns2_vc_bind *bind)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: implement weights after binds per sns implemented */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* initialize osmo_ctx on main tread */</span><br><span> static __attribute__((constructor)) void on_dso_load_ctx(void)</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 e07f6d4..0f22458 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -104,6 +104,8 @@</span><br><span> }</span><br><span> </span><br><span> 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, " IP-SNS signalling weight: %u data weight: %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> </span><br><span> llist_for_each_entry(nsvc, &bind->nsvc, blist) {</span><br><span>@@ -567,3 +569,16 @@</span><br><span> </span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! set the signalling and data weight for this bind</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] bind</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] signalling the signalling weight</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] data the data weight</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind, uint8_t signalling, uint8_t data)</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%);">+ bind->sns_sig_weight = signalling;</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->sns_data_weight = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_sns_update_weights(bind);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 3646080..55f88b1 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -66,6 +66,8 @@</span><br><span> int dscp;</span><br><span> bool accept_ipaccess;</span><br><span> bool accept_sns;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ip_sns_sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ip_sns_data_weight;</span><br><span> };</span><br><span> </span><br><span> /* TODO: this should into osmo timer */</span><br><span>@@ -118,6 +120,8 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ vbind->ip_sns_sig_weight = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ vbind->ip_sns_data_weight = 1;</span><br><span> llist_add(&vbind->list, &binds);</span><br><span> return vbind;</span><br><span> }</span><br><span>@@ -328,6 +332,8 @@</span><br><span> vty_out(vty, " accept-ipaccess%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%);">+ vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vbind->ip_sns_sig_weight, vbind->ip_sns_data_weight, VTY_NEWLINE);</span><br><span> break;</span><br><span> default:</span><br><span> return;</span><br><span>@@ -611,6 +617,34 @@</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_ip_sns_weight, cfg_ns_bind_ip_sns_weight_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ip-sns signalling-weight <0-254> data-weight <0-254>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "IP SNS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "signalling weight used by IP-SNS dynamic configuration\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "signalling weight used by IP-SNS dynamic configuration\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "data weight used by IP-SNS dynamic configuration\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "data weight used by IP-SNS dynamic configuration\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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ int signalling = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ int data = atoi(argv[1]);</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, "ip-sns signalling-weight <0-254> data-weight <0-254> 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->ip_sns_data_weight = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ vbind->ip_sns_sig_weight = signalling;</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_sns_weight(bind, signalling, data);</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> </span><br><span> DEFUN(cfg_ns_bind_fr, cfg_ns_bind_fr_cmd,</span><br><span> "fr NETIF (fr|frnet)",</span><br><span>@@ -1686,6 +1720,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_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> install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_fr_cmd);</span><br><span>diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map</span><br><span>index a3171d0..7da11cd 100644</span><br><span>--- a/src/gb/libosmogb.map</span><br><span>+++ b/src/gb/libosmogb.map</span><br><span>@@ -158,6 +158,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_sns_weight;</span><br><span> gprs_ns2_ip_bind_sockaddr;</span><br><span> gprs_ns2_ip_connect;</span><br><span> gprs_ns2_ip_connect2;</span><br><span>diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty</span><br><span>index 397ec26..a748f13 100644</span><br><span>--- a/tests/gb/gprs_ns2_vty.vty</span><br><span>+++ b/tests/gb/gprs_ns2_vty.vty</span><br><span>@@ -30,4 +30,5 @@</span><br><span> OsmoNSdummy(config-ns-bind)# end</span><br><span> OsmoNSdummy# show ns</span><br><span> UDP bind: 127.0.0.14:42999 DSCP: 0</span><br><span style="color: hsl(120, 100%, 40%);">+ IP-SNS signalling weight: 1 data weight: 1</span><br><span> 0 NS-VC: </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22868">change 22868</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/+/22868"/><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: I5133e4229377d44772a9af28628a2bc420fea34b </div>
<div style="display:none"> Gerrit-Change-Number: 22868 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>