<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/24443">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Don't route messages to an SGSN if it is down<br><br>If an SGSN in a pool is down we expect the messages to instead be sent<br>to a different SGSN in the pool. That SGSN will not necessarily know<br>what to do with those messages, but it should (implicitly) detach that<br>UE so that it can reattach at the new SGSN. Otherwise UEs on a failed<br>SGSN would simply stop working as the messages would never be forwarded<br>anywhere.<br><br>Fixes: OS#4952<br>Change-Id: I3f794659866e1f31496a39ca631b3b042a60aa27<br>---<br>M include/osmocom/gbproxy/gb_proxy.h<br>M src/gb_proxy.c<br>M src/gb_proxy_peer.c<br>3 files changed, 34 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gbproxy/gb_proxy.h b/include/osmocom/gbproxy/gb_proxy.h</span><br><span>index d6bf340..afd4b5f 100644</span><br><span>--- a/include/osmocom/gbproxy/gb_proxy.h</span><br><span>+++ b/include/osmocom/gbproxy/gb_proxy.h</span><br><span>@@ -168,6 +168,7 @@</span><br><span> </span><br><span> /* Are we facing towards a SGSN (true) or BSS (false) */</span><br><span> bool sgsn_facing;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool alive;</span><br><span> </span><br><span> /* List of all BVCs in this NSE */</span><br><span> DECLARE_HASHTABLE(bvcs, 10);</span><br><span>@@ -306,3 +307,4 @@</span><br><span> struct gbproxy_sgsn *gbproxy_sgsn_by_nri(struct gbproxy_config *cfg, uint16_t nri, bool *null_nri);</span><br><span> struct gbproxy_sgsn *gbproxy_sgsn_by_tlli(struct gbproxy_config *cfg, struct gbproxy_sgsn *sgsn_avoid,</span><br><span> uint32_t tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_sgsn *gbproxy_sgsn_by_available(struct gbproxy_config *cfg);</span><br><span>\ No newline at end of file</span><br><span>diff --git a/src/gb_proxy.c b/src/gb_proxy.c</span><br><span>index 31c5a6b..b8bbc9a 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -265,22 +265,24 @@</span><br><span> bool null_nri = false;</span><br><span> </span><br><span> if (!tlli) {</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn = llist_first_entry(&cfg->sgsns, struct gbproxy_sgsn, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn = gbproxy_sgsn_by_available(cfg);</span><br><span> if (!sgsn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "Could not find any available SGSN\n");</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPSGSN(sgsn, LOGL_INFO, "Could not get TLLI, using first SGSN\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSGSN(sgsn, LOGL_INFO, "Could not get TLLI, using first available SGSN\n");</span><br><span> return sgsn;</span><br><span> }</span><br><span> </span><br><span> if (cfg->pool.nri_bitlen == 0) {</span><br><span> /* Pooling is disabled */</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn = llist_first_entry(&cfg->sgsns, struct gbproxy_sgsn, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn = gbproxy_sgsn_by_available(cfg);</span><br><span> if (!sgsn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "Could not find any available SGSN\n");</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPSGSN(sgsn, LOGL_INFO, "Pooling disabled, using first configured SGSN\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSGSN(sgsn, LOGL_INFO, "Pooling disabled, using first available SGSN\n");</span><br><span> } else {</span><br><span> /* Pooling is enabled, try to use the NRI for routing to an SGSN</span><br><span> * See 3GPP TS 23.236 Ch. 5.3.2 */</span><br><span>@@ -1527,9 +1529,6 @@</span><br><span> </span><br><span> void gprs_ns_prim_status_cb(struct gbproxy_config *cfg, struct osmo_gprs_ns2_prim *nsp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: bss nsei available/unavailable bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_BLOCK, nsvc->nsei, bvc->bvci, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int i;</span><br><span> struct gbproxy_bvc *bvc;</span><br><span> struct gbproxy_nse *nse;</span><br><span>@@ -1543,6 +1542,7 @@</span><br><span> LOGP(DGPRS, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);</span><br><span> nse = gbproxy_nse_by_nsei(cfg, nsp->nsei, NSE_F_SGSN);</span><br><span> if (nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->alive = true;</span><br><span> // Update the NSE max SDU len</span><br><span> nse->max_sdu_len = nsp->u.status.mtu;</span><br><span> </span><br><span>@@ -1560,6 +1560,8 @@</span><br><span> LOGP(DGPRS, LOGL_ERROR, "Unknown NSE(%05d) became unavailable\n", nsp->nsei);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->alive = false;</span><br><span> if (nse->sgsn_facing) {</span><br><span> struct hlist_node *ntmp;</span><br><span> /* SGSN */</span><br><span>diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c</span><br><span>index fa99832..0f15e9d 100644</span><br><span>--- a/src/gb_proxy_peer.c</span><br><span>+++ b/src/gb_proxy_peer.c</span><br><span>@@ -625,7 +625,7 @@</span><br><span> if (!sgsn)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(sgsn->nse)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(sgsn->nse);</span><br><span> </span><br><span> _nse_free(sgsn->nse);</span><br><span> _sgsn_free(sgsn);</span><br><span>@@ -696,6 +696,9 @@</span><br><span> OSMO_ASSERT(cfg);</span><br><span> </span><br><span> llist_for_each_entry(sgsn, &cfg->sgsns, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sgsn->nse->alive)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (osmo_nri_v_matches_ranges(nri, sgsn->pool.nri_ranges)) {</span><br><span> /* Also check if the NRI we're looking for is a NULL NRI */</span><br><span> if (null_nri) {</span><br><span>@@ -711,7 +714,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Select a pseudo-random SGSN for a given TLLI, ignoring any SGSN that is not accepting connections</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Select a pseudo-random SGSN for a given TLLI, ignoring any SGSN that is not accepting connections or down</span><br><span> * \param[in] cfg The gbproxy configuration</span><br><span> * \param[in] sgsn_avoid If not NULL then avoid this SGSN when selecting a new one. Use for load redistribution</span><br><span> * \param[in] tlli The tlli to choose an SGSN for. The same tlli will map to the same SGSN as long as no SGSN is</span><br><span>@@ -743,7 +746,7 @@</span><br><span> </span><br><span> /* Get the first enabled SGSN after index */</span><br><span> llist_for_each_entry(sgsn, &cfg->sgsns, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (i >= index && sgsn->pool.allow_attach) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i >= index && sgsn->pool.allow_attach && sgsn->nse->alive) {</span><br><span> return sgsn;</span><br><span> }</span><br><span> i++;</span><br><span>@@ -753,7 +756,7 @@</span><br><span> llist_for_each_entry(sgsn, &cfg->sgsns, list) {</span><br><span> if (i >= index) {</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (sgsn->pool.allow_attach) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (sgsn->pool.allow_attach && sgsn->nse->alive) {</span><br><span> return sgsn;</span><br><span> }</span><br><span> i++;</span><br><span>@@ -761,3 +764,19 @@</span><br><span> </span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return the first available gbproxy_sgsn</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] cfg proxy in which we operate</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return The SGSN, NULL if no matching SGSN could be found</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_sgsn *gbproxy_sgsn_by_available(struct gbproxy_config *cfg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_sgsn *sgsn;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(sgsn, &cfg->sgsns, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sgsn->nse->alive &&sgsn->pool.allow_attach)</span><br><span style="color: hsl(120, 100%, 40%);">+ return sgsn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/24443">change 24443</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-gbproxy/+/24443"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gbproxy </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3f794659866e1f31496a39ca631b3b042a60aa27 </div>
<div style="display:none"> Gerrit-Change-Number: 24443 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </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: 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>