<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24591">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: implement outbound DEL SNS procedures<br><br>When removing a bind the remote side needs to be<br>informed via the SNS-DELETE procedure.<br><br>Related: OS#5036<br>Change-Id: I53cd54dfd262c70c425c3f13dad3b29526daa523<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 76 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/24591/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 656e06f..091a62b 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -592,6 +592,32 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int remove_bind_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems, struct ns2_sns_bind *sbind)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_ie_ip4_elem ip4;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_ie_ip6_elem ip6;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *saddr = gprs_ns2_ip_bind_sockaddr(sbind->bind);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (saddr->u.sa.sa_family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ ip4.ip_addr = saddr->u.sin.sin_addr.s_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip4.udp_port = saddr->u.sin.sin_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip4.sig_weight = sbind->bind->sns_sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip4.data_weight = sbind->bind->sns_data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ return remove_ip4_elem(gss, elems, &ip4);</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&ip6.ip_addr, &saddr->u.sin6.sin6_addr, sizeof(struct in6_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ ip6.udp_port = saddr->u.sin.sin_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip6.sig_weight = sbind->bind->sns_sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip6.data_weight = sbind->bind->sns_data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ return remove_ip6_elem(gss, elems, &ip6);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</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 -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int do_sns_change_weight(struct osmo_fsm_inst *fi, const struct gprs_ns_ie_ip4_elem *ip4, const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span> {</span><br><span> struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span>@@ -1484,6 +1510,12 @@</span><br><span> else</span><br><span> ns2_tx_sns_change_weight(gss->sns_nsvc, gss->current_procedure->trans_id, NULL, 0, &gss->current_procedure->ip6, 1);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SNS_DEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->family == AF_INET)</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_sns_del(gss->sns_nsvc, gss->current_procedure->trans_id, &gss->current_procedure->ip4, 1, NULL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_tx_sns_del(gss->sns_nsvc, gss->current_procedure->trans_id, NULL, 0, &gss->current_procedure->ip6, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>@@ -1596,8 +1628,11 @@</span><br><span> add_ip6_elem(gss, &gss->local, &gss->current_procedure->ip6);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- create_nsvc_for_new_sbind(gss, gss->current_procedure->sbind);</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_start_alive_all_nsvcs(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* the sbind can be NULL if the bind has been released by del_bind */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->current_procedure->sbind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ create_nsvc_for_new_sbind(gss, gss->current_procedure->sbind);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_start_alive_all_nsvcs(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> case SNS_CHANGE_WEIGHT:</span><br><span> switch (gss->family) {</span><br><span>@@ -1630,6 +1665,16 @@</span><br><span> OSMO_ASSERT(0);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SNS_DEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gss->family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ remove_ip4_elem(gss, &gss->local, &gss->current_procedure->ip4);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ remove_ip6_elem(gss, &gss->local, &gss->current_procedure->ip6);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>@@ -1851,6 +1896,8 @@</span><br><span> switch (procedure_type) {</span><br><span> case SNS_ADD:</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SNS_DEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case SNS_CHANGE_WEIGHT:</span><br><span> llist_for_each_entry(procedure, &gss->procedures, list) {</span><br><span> if (procedure->sbind == sbind && procedure->procedure == procedure_type &&</span><br><span>@@ -1881,8 +1928,16 @@</span><br><span> if (!procedure)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ switch (procedure_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SNS_ADD:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SNS_CHANGE_WEIGHT:</span><br><span style="color: hsl(120, 100%, 40%);">+ procedure->sbind = sbind;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_add_tail(&procedure->list, &gss->procedures);</span><br><span style="color: hsl(0, 100%, 40%);">- procedure->sbind = sbind;</span><br><span> procedure->procedure = procedure_type;</span><br><span> procedure->sig_weight = sbind->bind->sns_sig_weight;</span><br><span> procedure->data_weight = sbind->bind->sns_data_weight;</span><br><span>@@ -1895,7 +1950,6 @@</span><br><span> procedure->ip4.data_weight = sbind->bind->sns_data_weight;</span><br><span> break;</span><br><span> case AF_INET6:</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> memcpy(&procedure->ip6.ip_addr, &saddr->u.sin6.sin6_addr, sizeof(struct in6_addr));</span><br><span> procedure->ip6.udp_port = saddr->u.sin.sin_port;</span><br><span> procedure->ip6.sig_weight = sbind->bind->sns_sig_weight;</span><br><span>@@ -1950,6 +2004,7 @@</span><br><span> struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> struct ns2_sns_bind *sbind;</span><br><span> struct gprs_ns2_vc *nsvc, *nsvc2;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ns2_sns_procedure *procedure;</span><br><span> </span><br><span> switch (event) {</span><br><span> case GPRS_SNS_EV_REQ_ADD_BIND:</span><br><span>@@ -2022,25 +2077,39 @@</span><br><span> case GPRS_SNS_ST_UNCONFIGURED:</span><br><span> break;</span><br><span> case GPRS_SNS_ST_BSS_SIZE:</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: remove the ip4 element from the list */</span><br><span> llist_for_each_entry_safe(nsvc, nsvc2, &nse->nsvc, list) {</span><br><span> if (nsvc->bind == sbind->bind) {</span><br><span> gprs_ns2_free_nsvc(nsvc);</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span> break;</span><br><span> case GPRS_SNS_ST_BSS_CONFIG_BSS:</span><br><span> case GPRS_SNS_ST_BSS_CONFIG_SGSN:</span><br><span> case GPRS_SNS_ST_CONFIGURED:</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: do an delete SNS-IP procedure */</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: remove the ip4 element to the list */</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_ST_LOCAL_PROCEDURE:</span><br><span style="color: hsl(120, 100%, 40%);">+ remove_bind_elem(gss, &gss->local_procedure, sbind);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip46_weight_sum(&gss->local_procedure, true) == 0 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ ip46_weight_sum(&gss->local_procedure, false) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "NSE %d: weight become invalid because of removing bind %s. Resetting the configuration\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->nsei, sbind->bind->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> llist_for_each_entry_safe(nsvc, nsvc2, &nse->nsvc, list) {</span><br><span> if (nsvc->bind == sbind->bind) {</span><br><span> gprs_ns2_free_nsvc(nsvc);</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ensure other procedures doesn't use the sbind */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(procedure, &gss->procedures, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (procedure->sbind == sbind)</span><br><span style="color: hsl(120, 100%, 40%);">+ procedure->sbind = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_add_procedure(gss, sbind, SNS_DEL);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* if this is the last bind, the free_nsvc() will trigger a reselection */</span><br><span> talloc_free(sbind);</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24591">change 24591</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/+/24591"/><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: I53cd54dfd262c70c425c3f13dad3b29526daa523 </div>
<div style="display:none"> Gerrit-Change-Number: 24591 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>