<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22298">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Use IMSI cache for PTP paging and implement DUMMY_PAGING_PS<br><br>Some code was missing to support PAGING_REJECT and DUMMY_PAGING_PS over both PTP<br>and signalling. This commit adds the missing pieces, notably:<br><br>* Use and route according to the IMSI cache for paging on PTP<br>* Ensure DUMMY_PAGING_PS is broadcast if no routing area is included<br><br>Change-Id: I7243e0d4470cb62fa6db36d26002ccd6542b5147<br>Related: OS#4951, OS#4472<br>---<br>M src/gbproxy/gb_proxy.c<br>1 file changed, 38 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/98/22298/1</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 1ce2716..0bc47e3 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -425,9 +425,20 @@</span><br><span> break;</span><br><span> case BSSGP_PDUT_DUMMY_PAGING_PS_RESP:</span><br><span> case BSSGP_PDUT_PAGING_PS_REJECT:</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: Implement via state tracking of PAGING-PS + DUMMY_PAGING_PS */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n", pdut_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Route according to IMSI<->NSE cache entry */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mobile_identity mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *mi_data = TLVP_VAL(&tp, BSSGP_IE_IMSI);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mi_len = TLVP_LEN(&tp, BSSGP_IE_IMSI);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mobile_identity_decode(&mi, mi_data, mi_len, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gbproxy_nse_by_imsi(nse->cfg, mi.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(nse->sgsn_facing);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gbprox_relay2nse(msg, nse, ns_bvci);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> case BSSGP_PDUT_FLOW_CONTROL_BVC:</span><br><span> osmo_fsm_inst_dispatch(bss_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC, msg);</span><br><span> break;</span><br><span>@@ -513,9 +524,21 @@</span><br><span> switch (bgph->pdu_type) {</span><br><span> case BSSGP_PDUT_FLOW_CONTROL_BVC_ACK:</span><br><span> return osmo_fsm_inst_dispatch(sgsn_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC_ACK, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_PDUT_DUMMY_PAGING_PS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_PDUT_PAGING_PS:</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cache the IMSI<->NSE to route PAGING REJECT */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mobile_identity mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *mi_data = TLVP_VAL(&tp, BSSGP_IE_IMSI);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mi_len = TLVP_LEN(&tp, BSSGP_IE_IMSI);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mobile_identity_decode(&mi, mi_data, mi_len, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbproxy_imsi_cache_update(nse, mi.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);</span><br><span> </span><br><span> }</span><br><span> </span><br><span>@@ -934,6 +957,7 @@</span><br><span> gbprox_bss2sgsn_tlli(from_bvc->cell, msg, &tlli, true);</span><br><span> break;</span><br><span> case BSSGP_PDUT_PAGING_PS_REJECT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_PDUT_DUMMY_PAGING_PS_RESP:</span><br><span> {</span><br><span> /* Route according to IMSI<->NSE cache entry */</span><br><span> struct osmo_mobile_identity mi;</span><br><span>@@ -944,6 +968,7 @@</span><br><span> if (!nse) {</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(nse->sgsn_facing);</span><br><span> rc = gbprox_relay2nse(msg, nse, 0);</span><br><span> break;</span><br><span> }</span><br><span>@@ -961,7 +986,7 @@</span><br><span> </span><br><span> /* Receive paging request from SGSN, we need to relay to proper BSS */</span><br><span> static int gbprox_rx_paging(struct gbproxy_nse *sgsn_nse, struct msgb *msg, const char *pdut_name,</span><br><span style="color: hsl(0, 100%, 40%);">- struct tlv_parsed *tp, uint16_t ns_bvci)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed *tp, uint16_t ns_bvci, bool broadcast)</span><br><span> {</span><br><span> struct gbproxy_config *cfg = sgsn_nse->cfg;</span><br><span> struct gbproxy_bvc *sgsn_bvc, *bss_bvc;</span><br><span>@@ -1014,7 +1039,7 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (TLVP_PRES_LEN(tp, BSSGP_IE_BSS_AREA_ID, 1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (TLVP_PRES_LEN(tp, BSSGP_IE_BSS_AREA_ID, 1) || broadcast) {</span><br><span> /* iterate over all bvcs and dispatch the paging to each matching one */</span><br><span> hash_for_each(cfg->bss_nses, i, nse, list) {</span><br><span> hash_for_each(nse->bvcs, j, bss_bvc, list) {</span><br><span>@@ -1079,6 +1104,7 @@</span><br><span> int rc = 0;</span><br><span> int cause;</span><br><span> int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool paging_bc = false;</span><br><span> </span><br><span> snprintf(log_pfx, sizeof(log_pfx), "NSE(%05u/SGSN)-BVC(%05u/??)", nse->nsei, ns_bvci);</span><br><span> </span><br><span>@@ -1147,6 +1173,11 @@</span><br><span> if (sgsn_bvc->cell && sgsn_bvc->cell->bss_bvc)</span><br><span> rc = gbprox_relay2peer(msg, sgsn_bvc->cell->bss_bvc, ns_bvci);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_PDUT_DUMMY_PAGING_PS:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Routing area is optional in dummy paging and we have nothing else to go by</span><br><span style="color: hsl(120, 100%, 40%);">+ * so in case it is missing we need to broadcast the paging */</span><br><span style="color: hsl(120, 100%, 40%);">+ paging_bc = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fall through */</span><br><span> case BSSGP_PDUT_PAGING_PS:</span><br><span> {</span><br><span> /* Cache the IMSI<->NSE to route PAGING REJECT */</span><br><span>@@ -1159,7 +1190,7 @@</span><br><span> }</span><br><span> case BSSGP_PDUT_PAGING_CS:</span><br><span> /* process the paging request (LAI/RAI lookup) */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gbprox_rx_paging(nse, msg, pdut_name, &tp, ns_bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gbprox_rx_paging(nse, msg, pdut_name, &tp, ns_bvci, paging_bc);</span><br><span> break;</span><br><span> case BSSGP_PDUT_STATUS:</span><br><span> /* Some exception has occurred */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22298">change 22298</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/+/22298"/><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: I7243e0d4470cb62fa6db36d26002ccd6542b5147 </div>
<div style="display:none"> Gerrit-Change-Number: 22298 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>