<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21247">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: move link layer type into NSE<br><br>Even it was in theory possible to mix NS-VC ll types within<br>a NSE. This is an unrealistic configuration.<br>Further more to select the correct load sharing mechanism<br>the NSE must know the correct link layer.<br><br>Change-Id: I18dfd40a2429cd61b7c4a3dad5f226c64296f7d8<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_fr.c<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>7 files changed, 22 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/21247/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 70b4bca..2da2eef 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -139,7 +139,8 @@</span><br><span> int gprs_ns2_nse_foreach_nsvc(struct gprs_ns2_nse *nse,</span><br><span> gprs_ns2_foreach_nsvc_cb cb, void *cb_data);</span><br><span> struct gprs_ns2_nse *gprs_ns2_nse_by_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei);</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_ll linklayer);</span><br><span> uint16_t gprs_ns2_nse_nsei(struct gprs_ns2_nse *nse);</span><br><span> void gprs_ns2_free_nse(struct gprs_ns2_nse *nse);</span><br><span> void gprs_ns2_free_nses(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 004d0ad..25758cf 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -226,7 +226,7 @@</span><br><span> if (!buf_len)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (nsvc->ll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nsvc->nse->ll) {</span><br><span> case GPRS_NS2_LL_UDP:</span><br><span> if (!gprs_ns2_is_ip_bind(nsvc->bind)) {</span><br><span> buf[0] = '\0';</span><br><span>@@ -392,15 +392,11 @@</span><br><span> /* signalling */</span><br><span> nsvc = ns2_load_sharing_signal(nse);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_ns2_ll ll;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* data with load sharing parameter */</span><br><span> if (llist_empty(&nse->nsvc))</span><br><span> return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = llist_first_entry(&nse->nsvc, struct gprs_ns2_vc, list);</span><br><span style="color: hsl(0, 100%, 40%);">- ll = nsvc->ll;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (ll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nse->ll) {</span><br><span> case GPRS_NS2_LL_FR:</span><br><span> nsvc = ns2_load_sharing_modulor(nse, bvci, link_selector);</span><br><span> break;</span><br><span>@@ -671,7 +667,7 @@</span><br><span> * \param[in] nsi NS instance in which to create NS Entity</span><br><span> * \param[in] nsei NS Entity Identifier of to-be-created NSE</span><br><span> * \returns newly-allocated NS-E in successful case; NULL on error */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei)</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei, enum gprs_ns2_ll linklayer)</span><br><span> {</span><br><span> struct gprs_ns2_nse *nse;</span><br><span> </span><br><span>@@ -685,6 +681,7 @@</span><br><span> if (!nse)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ nse->ll = linklayer;</span><br><span> nse->nsei = nsei;</span><br><span> nse->nsi = nsi;</span><br><span> nse->first = true;</span><br><span>@@ -840,7 +837,7 @@</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(bind->nsi, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(bind->nsi, nsei, bind->ll);</span><br><span> if (!nse) {</span><br><span> return GPRS_NS2_CS_ERROR;</span><br><span> }</span><br><span>@@ -850,8 +847,6 @@</span><br><span> if (!nsvc)</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->ll = GPRS_NS2_LL_UDP;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> nsvci = tlvp_val16be(&tp, NS_IE_VCI);</span><br><span> nsvc->nsvci = nsvci;</span><br><span> nsvc->nsvci_is_valid = true;</span><br><span>@@ -921,7 +916,7 @@</span><br><span> struct gprs_ns2_nse *nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span> </span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(bind->nsi, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(bind->nsi, nsei, GPRS_NS2_LL_UDP);</span><br><span> if (!nse)</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -942,7 +937,7 @@</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> </span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(bind->nsi, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(bind->nsi, nsei, GPRS_NS2_LL_UDP);</span><br><span> if (!nse)</span><br><span> return -1;</span><br><span> }</span><br><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index 40ea64c..4eb75fd 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -390,6 +390,7 @@</span><br><span> return -ENOSPC;</span><br><span> </span><br><span> bind->driver = &vc_driver_fr;</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->ll = GPRS_NS2_LL_FR;</span><br><span> bind->send_vc = fr_vc_sendmsg;</span><br><span> bind->free_vc = free_vc;</span><br><span> bind->dump_vty = dump_vty;</span><br><span>@@ -502,7 +503,7 @@</span><br><span> struct priv_vc *priv = NULL;</span><br><span> struct gprs_ns2_nse *nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(bind->nsi, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(bind->nsi, nsei, GPRS_NS2_LL_FR);</span><br><span> if (!nse)</span><br><span> return NULL;</span><br><span> created_nse = true;</span><br><span>@@ -523,7 +524,6 @@</span><br><span> </span><br><span> nsvc->nsvci = nsvci;</span><br><span> nsvc->nsvci_is_valid = true;</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->ll = GPRS_NS2_LL_FR;</span><br><span> </span><br><span> gprs_ns2_vc_fsm_start(nsvc);</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index cd478d6..3c276bc 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -555,6 +555,7 @@</span><br><span> }</span><br><span> </span><br><span> bind->driver = &vc_driver_frgre;</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->ll = GPRS_NS2_LL_FR_GRE;</span><br><span> bind->send_vc = frgre_vc_sendmsg;</span><br><span> bind->free_vc = free_vc;</span><br><span> bind->nsi = nsi;</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index 2c74bab..c7256bc 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -123,6 +123,9 @@</span><br><span> /*! true if this NSE has at least one alive VC */</span><br><span> bool alive;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /*! which link-layer are we based on? */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_ll ll;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_fsm_inst *bss_sns_fi;</span><br><span> };</span><br><span> </span><br><span>@@ -164,8 +167,6 @@</span><br><span> struct rate_ctr_group *ctrg;</span><br><span> struct osmo_stat_item_group *statg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /*! which link-layer are we based on? */</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_ns2_ll ll;</span><br><span> enum gprs_ns2_vc_mode mode;</span><br><span> </span><br><span> struct osmo_fsm_inst *fi;</span><br><span>@@ -186,6 +187,9 @@</span><br><span> /*! if VCs use reset/block/unblock method. IP shall not use this */</span><br><span> enum gprs_ns2_vc_mode vc_mode;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /*! which link-layer are we based on? */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_ll ll;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! send a msg over a VC */</span><br><span> int (*send_vc)(struct gprs_ns2_vc *nsvc, struct msgb *msg);</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 38c1a16..7f82667 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -322,6 +322,7 @@</span><br><span> }</span><br><span> </span><br><span> bind->driver = &vc_driver_ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->ll = GPRS_NS2_LL_UDP;</span><br><span> bind->send_vc = nsip_vc_sendmsg;</span><br><span> bind->free_vc = free_vc;</span><br><span> bind->dump_vty = dump_vty;</span><br><span>@@ -391,8 +392,6 @@</span><br><span> priv = nsvc->priv;</span><br><span> priv->remote = *remote;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->ll = GPRS_NS2_LL_UDP;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return nsvc;</span><br><span> }</span><br><span> </span><br><span>@@ -403,9 +402,6 @@</span><br><span> {</span><br><span> struct priv_bind *priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->ll != GPRS_NS2_LL_UDP)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (nsvc->bind->driver != &vc_driver_ip)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -420,7 +416,7 @@</span><br><span> {</span><br><span> struct priv_vc *priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->ll != GPRS_NS2_LL_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->bind->driver != &vc_driver_ip)</span><br><span> return NULL;</span><br><span> </span><br><span> priv = nsvc->priv;</span><br><span>@@ -442,7 +438,7 @@</span><br><span> struct priv_vc *vpriv;</span><br><span> struct priv_bind *bpriv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->ll != GPRS_NS2_LL_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->bind->driver != &vc_driver_ip)</span><br><span> return false;</span><br><span> </span><br><span> vpriv = nsvc->priv;</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 57b92e9..e63b962 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -495,11 +495,6 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (vtyvc->ll != GPRS_NS2_LL_FR_GRE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Warning: seting FR DLCI on non-FR NSE%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> vtyvc->frdlci = dlci;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -848,7 +843,7 @@</span><br><span> </span><br><span> nse = gprs_ns2_nse_by_nsei(vty_nsi, vtyvc->nsei);</span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(vty_nsi, vtyvc->nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(vty_nsi, vtyvc->nsei, vtyvc->ll);</span><br><span> if (!nse) {</span><br><span> /* Could not create NSE for VTY */</span><br><span> continue;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21247">change 21247</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/+/21247"/><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: I18dfd40a2429cd61b7c4a3dad5f226c64296f7d8 </div>
<div style="display:none"> Gerrit-Change-Number: 21247 </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>