<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22913">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_bssgp: rework ns_create_nsvc<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><br>Related: SYS#5354<br>Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb<br>---<br>M src/gprs_bssgp_pcu.c<br>1 file changed, 20 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/13/22913/1</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..7b28665 100644</span><br><span>--- a/src/gprs_bssgp_pcu.c</span><br><span>+++ b/src/gprs_bssgp_pcu.c</span><br><span>@@ -988,10 +988,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 0;</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 +1020,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 +1045,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></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: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>