<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20530">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
lynxis lazus: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_bssgp_pcu: fix: do not crash on receipt of subsequent INFO.ind<br><br>It's expected to receive subsequent INFO.ind messages at run-time,<br>e.g. when a dynamic TCH/F_TCH/H_PDCH timeslot is switched from<br>PDCH to TCH/F or TCH/H, osmo-bts would send us INFO.ind with the<br>updated PDCH slot-mask indicating that this timeslot is disabled.<br><br>In gprs_nsvc_create_and_connect(), do not bind() on the received<br>NSVC address unconditionally - we may already be bound to it.<br>Instead, return early and keep everything unchanged.<br><br>I don't know how the PCU is supposed to handle NSVC address change,<br>at least the new NS2 library does not handle this internally, nor<br>it provides any API for that. Let's leave it for later.<br><br>Change-Id: I159138e41e147cd30212da548b0ccd3f81d61b4e<br>Related: I4c3bc883d795e5d1ee5ab175ac03684924692a7c<br>Fixes: Ib389925cf5c9f18951af6242c31ea70476218e9a<br>Related: SYS#5108<br>---<br>M src/gprs_bssgp_pcu.cpp<br>1 file changed, 15 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp</span><br><span>index e0cfc37..adf5bf3 100644</span><br><span>--- a/src/gprs_bssgp_pcu.cpp</span><br><span>+++ b/src/gprs_bssgp_pcu.cpp</span><br><span>@@ -930,6 +930,21 @@</span><br><span> struct gprs_ns2_vc_bind *bind;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nse = gprs_ns2_nse_by_nsei(bts->nsi, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->nse != NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: we end up here on receipt of subsequent INFO.ind.</span><br><span style="color: hsl(120, 100%, 40%);">+ * What are we supposed to do? Re-establish the connection? */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBSSGP, LOGL_INFO, "NSE with NSEI %u is already configured, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "keeping it unchanged\n", nsei);</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 style="color: hsl(120, 100%, 40%);">+ bts->nse = gprs_ns2_create_nse(bts->nsi, nsei);</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> rc = gprs_ns2_ip_bind(bts->nsi, local, 0, &bind);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DBSSGP, LOGL_ERROR, "Failed to create socket\n");</span><br><span>@@ -937,16 +952,6 @@</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(bts->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(bts->nsi, nsei);</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_bind(bind);</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> if (bts->gb_dialect_sns) {</span><br><span> rc = gprs_ns2_ip_connect_sns(bind, sgsn, nsei);</span><br><span> } else {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20530">change 20530</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/+/20530"/><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: I159138e41e147cd30212da548b0ccd3f81d61b4e </div>
<div style="display:none"> Gerrit-Change-Number: 20530 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>