<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22913">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse<br><br>Add support for multiple SNS endpoints.<br>Move the NSE allocation to the top in preparation of IP-SNS binds.<br>The future gprs_ns2 library will require to manual add every bind to the NSE for IP-SNS.<br>Rename the function to match more it's purpose.<br><br>Related: SYS#5354<br>Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb<br>---<br>M src/gprs_bssgp_pcu.c<br>1 file changed, 40 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c</span><br><span>index a6b6f7e..7d793be 100644</span><br><span>--- a/src/gprs_bssgp_pcu.c</span><br><span>+++ b/src/gprs_bssgp_pcu.c</span><br><span>@@ -975,12 +975,22 @@</span><br><span> osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, the_pcu->vty.fc_interval, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int ns_create_nsvc(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *local,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *remote,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint16_t *nsvci,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t valid)</span><br><span style="color: hsl(120, 100%, 40%);">+/*! configure NS layer</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param bts pointer to the bts object</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param nsei the NSEI of the BSS</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param local pointer to an array of local address to bind on.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param remote pointer to an array of remote address SGSNs. If dynamic IP-SNS is used remote is used as initial SGSN endpoints.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param nsvci pointer to an array of nsvcis</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param valid bitmask. a 1 means the position in the array contains a valid entry for local, remote, nsvci</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 if the configuration has succeeded. on error != 0</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns_configure_nse(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *local,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint16_t *nsvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t valid)</span><br><span> {</span><br><span> int i, rc;</span><br><span> uint16_t binds = 0;</span><br><span>@@ -988,10 +998,20 @@</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct gprs_ns2_vc_bind *bind[PCU_IF_NUM_NSVC] = { };</span><br><span> char name[5];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool sns_configured = false;</span><br><span> </span><br><span> if (!valid)</span><br><span> return -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nse = gprs_ns2_nse_by_nsei(the_pcu->nsi, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->nse)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nse = gprs_ns2_create_nse(the_pcu->nsi, nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_LL_UDP, the_pcu->vty.ns_dialect);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n");</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> for (i = 0; i < PCU_IF_NUM_NSVC; i++) {</span><br><span> if (!(valid & (1 << i)))</span><br><span> continue;</span><br><span>@@ -1010,31 +1030,22 @@</span><br><span> </span><br><span> if (!binds) {</span><br><span> LOGP(DBSSGP, LOGL_ERROR, "Failed to bind to any NS-VC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_nses(the_pcu->nsi);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->nse = gprs_ns2_nse_by_nsei(the_pcu->nsi, nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->nse)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nse = gprs_ns2_create_nse(the_pcu->nsi, nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_LL_UDP, the_pcu->vty.ns_dialect);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n");</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_free_binds(the_pcu->nsi);</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> for (i = 0; i < PCU_IF_NUM_NSVC; i++) {</span><br><span> if (!(binds & (1 << i)))</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: for SNS we just use the first successful NS-VC instead of all for the initial connect */</span><br><span> if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) {</span><br><span> rc = gprs_ns2_sns_add_endpoint(bts->nse, &remote[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc && rc != -EALREADY) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBSSGP, LOGL_ERROR, "Failed to add SNS endpoint %s!\n", osmo_sockaddr_to_str(&remote[i]));</span><br><span> return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "Failed to connect to (SNS) towards SGSN %s!\n", osmo_sockaddr_to_str(&remote[i]));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ sns_configured = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else {</span><br><span> nsvc = gprs_ns2_ip_connect(bind[i], &remote[i], bts->nse, nsvci[i]);</span><br><span> if (nsvc)</span><br><span>@@ -1044,7 +1055,10 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return nsvcs ? 0 : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS)</span><br><span style="color: hsl(120, 100%, 40%);">+ return sns_configured ? 0 : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return nsvcs ? 0 : -1;</span><br><span> }</span><br><span> </span><br><span> struct nsvc_cb {</span><br><span>@@ -1093,12 +1107,12 @@</span><br><span> /* there shouldn't any previous state. */</span><br><span> gprs_ns2_free_nses(the_pcu->nsi);</span><br><span> gprs_ns2_free_binds(the_pcu->nsi);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid);</span><br><span> } else if (nsei != gprs_ns2_nse_nsei(bts->nse)) {</span><br><span> /* the NSEI has changed */</span><br><span> gprs_ns2_free_nses(the_pcu->nsi);</span><br><span> gprs_ns2_free_binds(the_pcu->nsi);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid);</span><br><span> } else if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) {</span><br><span> /* SNS: check if the initial nsvc is the same, if not recreate it */</span><br><span> const struct osmo_sockaddr *initial = gprs_ns2_nse_sns_remote(bts->nse);</span><br><span>@@ -1114,7 +1128,7 @@</span><br><span> </span><br><span> gprs_ns2_free_nses(the_pcu->nsi);</span><br><span> gprs_ns2_free_binds(the_pcu->nsi);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid);</span><br><span> } else {</span><br><span> /* check if all NSVC are still the same. */</span><br><span> struct nsvc_cb data = {</span><br><span>@@ -1134,7 +1148,7 @@</span><br><span> </span><br><span> /* remove all found nsvcs from the valid field */</span><br><span> valid &= ~data.found;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid);</span><br><span> }</span><br><span> </span><br><span> if (rc)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22913">change 22913</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/osmo-pcu/+/22913"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb </div>
<div style="display:none"> Gerrit-Change-Number: 22913 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>