<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21417">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Only send paging to each matching NSE once<br><br>Fixes: SYS#5226<br>Change-Id: Ia33e7816b354266b9d2659ef96b798db60c134f3<br>---<br>M src/gbproxy/gb_proxy.c<br>1 file changed, 34 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index 1ca4fc6..db7f55b 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -813,11 +813,10 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* feed a message down the NS-VC associated with the specified peer */</span><br><span style="color: hsl(0, 100%, 40%);">-static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_peer *peer,</span><br><span style="color: hsl(120, 100%, 40%);">+/* feed a message down the NSE */</span><br><span style="color: hsl(120, 100%, 40%);">+static int gbprox_relay2nse(struct msgb *old_msg, struct gbproxy_nse *nse,</span><br><span> uint16_t ns_bvci)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gbproxy_nse *nse = peer->nse;</span><br><span> OSMO_ASSERT(nse);</span><br><span> OSMO_ASSERT(nse->cfg);</span><br><span> </span><br><span>@@ -825,7 +824,7 @@</span><br><span> * be free()d safely when we return from gbprox_rcvmsg() */</span><br><span> struct gprs_ns2_inst *nsi = nse->cfg->nsi;</span><br><span> struct osmo_gprs_ns2_prim nsp = {};</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2peer");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2nse");</span><br><span> uint32_t tlli;</span><br><span> int rc;</span><br><span> </span><br><span>@@ -849,6 +848,22 @@</span><br><span> osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA,</span><br><span> PRIM_OP_REQUEST, msg);</span><br><span> rc = gprs_ns2_recv_prim(nsi, &nsp.oph);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: We need a counter group for gbproxy_nse */</span><br><span style="color: hsl(120, 100%, 40%);">+ //if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ // rate_ctr_inc(&peer->ctrg->ctr[GBPROX_PEER_CTR_TX_ERR]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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%);">+/* feed a message down the NS-VC associated with the specified peer */</span><br><span style="color: hsl(120, 100%, 40%);">+static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_peer *peer,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t ns_bvci)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_nse *nse = peer->nse;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gbprox_relay2nse(old_msg, nse, ns_bvci);</span><br><span> if (rc < 0)</span><br><span> rate_ctr_inc(&peer->ctrg->ctr[GBPROX_PEER_CTR_TX_ERR]);</span><br><span> </span><br><span>@@ -1151,7 +1166,7 @@</span><br><span> {</span><br><span> struct gbproxy_nse *nse;</span><br><span> struct gbproxy_peer *peer;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int n_peers = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int n_nses = 0;</span><br><span> int errctr = GBPROX_GLOB_CTR_PROTO_ERR_SGSN;</span><br><span> </span><br><span> /* FIXME: Handle paging logic to only page each matching NSE */</span><br><span>@@ -1176,9 +1191,11 @@</span><br><span> llist_for_each_entry(nse, &cfg->nse_peers, list) {</span><br><span> llist_for_each_entry(peer, &nse->bts_peers, list) {</span><br><span> if (!memcmp(peer->ra, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA), 6)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DGPRS, LOGL_INFO, "routing by RAI to peer BVCI=%u\n", peer->bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- gbprox_relay2peer(msg, peer, ns_bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- n_peers++;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DGPRS, LOGL_INFO, "routing by RAI to peer NSEI=%u\n", peer->bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbprox_relay2nse(msg, nse, ns_bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ n_nses++;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only send it once to each NSE */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -1189,8 +1206,10 @@</span><br><span> llist_for_each_entry(peer, &nse->bts_peers, list) {</span><br><span> if (!memcmp(peer->ra, TLVP_VAL(tp, BSSGP_IE_LOCATION_AREA), 5)) {</span><br><span> LOGPC(DGPRS, LOGL_INFO, "routing by LAI to peer BVCI=%u\n", peer->bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- gbprox_relay2peer(msg, peer, ns_bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- n_peers++;</span><br><span style="color: hsl(120, 100%, 40%);">+ gbprox_relay2nse(msg, nse, ns_bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ n_nses++;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only send it once to each NSE */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -1199,8 +1218,10 @@</span><br><span> llist_for_each_entry(nse, &cfg->nse_peers, list) {</span><br><span> llist_for_each_entry(peer, &nse->bts_peers, list) {</span><br><span> LOGPC(DGPRS, LOGL_INFO, "broadcasting to peer BVCI=%u\n", peer->bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- gbprox_relay2peer(msg, peer, ns_bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- n_peers++;</span><br><span style="color: hsl(120, 100%, 40%);">+ gbprox_relay2nse(msg, nse, ns_bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ n_nses++;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only send it once to each NSE */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span> } else {</span><br><span>@@ -1210,7 +1231,7 @@</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (n_peers == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n_nses == 0) {</span><br><span> LOGP(DGPRS, LOGL_ERROR, "NSEI=%u(SGSN) BSSGP PAGING: "</span><br><span> "unable to route, no destination found\n", nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21417">change 21417</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-sgsn/+/21417"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia33e7816b354266b9d2659ef96b798db60c134f3 </div>
<div style="display:none"> Gerrit-Change-Number: 21417 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>