<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: 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;">gb_proxy: simplify raid data storage<br><br>Instead of storing the raw ra_id in its unparsed binary form, store it<br>as a parsed struct. Also store the cell-id on cell allocation for later<br>use.<br><br>Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c<br>Related: OS#4894<br>---<br>M include/osmocom/sgsn/gb_proxy.h<br>M src/gb_proxy.c<br>M src/gb_proxy_ctrl.c<br>M src/gb_proxy_vty.c<br>4 files changed, 26 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h</span><br><span>index d988cae..269b851 100644</span><br><span>--- a/include/osmocom/sgsn/gb_proxy.h</span><br><span>+++ b/include/osmocom/sgsn/gb_proxy.h</span><br><span>@@ -8,6 +8,7 @@</span><br><span> #include <osmocom/core/hashtable.h></span><br><span> #include <osmocom/gsm/gsm23003.h></span><br><span> #include <osmocom/gsm/gsm23236.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm48.h></span><br><span> #include <osmocom/gsm/protocol/gsm_23_003.h></span><br><span> </span><br><span> #include <osmocom/gprs/gprs_ns2.h></span><br><span>@@ -110,8 +111,13 @@</span><br><span> /* BVCI of PTP BVCs associated to this cell */</span><br><span> uint16_t bvci;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Routing Area that this BVC is part of (raw 04.08 encoding) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ra[6];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Routing Area that this cell is part of */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ra_id raid;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cell ID of this cell */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t cid;</span><br><span style="color: hsl(120, 100%, 40%);">+ } id;</span><br><span> </span><br><span> /* pointer to the BSS-side BVC */</span><br><span> struct gbproxy_bvc *bss_bvc;</span><br><span>@@ -131,8 +137,8 @@</span><br><span> /* PTP BVCI of this BVC */</span><br><span> uint16_t bvci;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Routing Area that this BVC is part of (raw 04.08 encoding) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ra[6];</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Routing Area that this BVC is part of */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ra_id raid;</span><br><span> </span><br><span> /* Counter */</span><br><span> struct rate_ctr_group *ctrg;</span><br><span>diff --git a/src/gb_proxy.c b/src/gb_proxy.c</span><br><span>index e8a78f2..12e685d 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -671,7 +671,8 @@</span><br><span> </span><br><span> bvc->cell = gbproxy_cell_alloc(cfg, bvci);</span><br><span> OSMO_ASSERT(bvc->cell);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(bvc->cell->ra, bvc->ra, sizeof(bvc->cell->ra));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&bvc->cell->id.raid, &bvc->raid, sizeof(bvc->cell->id.raid));</span><br><span style="color: hsl(120, 100%, 40%);">+ bvc->cell->id.cid = cell_id;</span><br><span> </span><br><span> /* link us to the cell and vice-versa */</span><br><span> bvc->cell->bss_bvc = bvc;</span><br><span>@@ -688,7 +689,7 @@</span><br><span> OSMO_ASSERT(sgsn_bvc);</span><br><span> </span><br><span> sgsn_bvc->cell = bvc->cell;</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(sgsn_bvc->ra, bvc->cell->ra, sizeof(sgsn_bvc->ra));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&sgsn_bvc->raid, &bvc->cell->id.raid, sizeof(sgsn_bvc->raid));</span><br><span> sgsn_bvc->fi = bssgp_bvc_fsm_alloc_ptp_bss(sgsn_bvc, cfg->nsi, sgsn_nse->nsei,</span><br><span> bvci, ra_id, cell_id);</span><br><span> OSMO_ASSERT(sgsn_bvc->fi);</span><br><span>@@ -878,8 +879,8 @@</span><br><span> * PDU, this means we can extend our local</span><br><span> * state information about this particular cell</span><br><span> * */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(from_bvc->ra, TLVP_VAL(tp, BSSGP_IE_CELL_ID), sizeof(from_bvc->ra));</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_parse_ra(&raid, from_bvc->ra);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_parse_ra(&raid, TLVP_VAL(tp, BSSGP_IE_CELL_ID));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&from_bvc->raid, &raid, sizeof(from_bvc->raid));</span><br><span> LOGPBVC(from_bvc, LOGL_INFO, "Cell ID %s\n", osmo_rai_name(&raid));</span><br><span> }</span><br><span> }</span><br><span>@@ -1053,11 +1054,13 @@</span><br><span> LOGPBVC(sgsn_bvc, LOGL_INFO, "Rx %s: routing by BVCI\n", pdut_name);</span><br><span> return gbprox_relay2peer(msg, sgsn_bvc->cell->bss_bvc, ns_bvci);</span><br><span> } else if (TLVP_PRES_LEN(tp, BSSGP_IE_ROUTEING_AREA, 6)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ra_id raid;</span><br><span> errctr = GBPROX_GLOB_CTR_INV_RAI;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_parse_ra(&raid, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA));</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 style="color: hsl(0, 100%, 40%);">- if (!memcmp(bss_bvc->ra, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA), 6)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_ra_equal(&bss_bvc->raid, &raid)) {</span><br><span> LOGPNSE(nse, LOGL_INFO, "Rx %s: routing to NSE (RAI match)\n",</span><br><span> pdut_name);</span><br><span> gbprox_relay2peer(msg, bss_bvc, ns_bvci);</span><br><span>@@ -1068,11 +1071,13 @@</span><br><span> }</span><br><span> }</span><br><span> } else if (TLVP_PRES_LEN(tp, BSSGP_IE_LOCATION_AREA, 5)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm48_ra_id lac;</span><br><span> errctr = GBPROX_GLOB_CTR_INV_LAI;</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 style="color: hsl(0, 100%, 40%);">- if (!memcmp(bss_bvc->ra, TLVP_VAL(tp, BSSGP_IE_LOCATION_AREA), 5)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_encode_ra(&lac, &bss_bvc->raid);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!memcmp(&lac, TLVP_VAL(tp, BSSGP_IE_LOCATION_AREA), 5)) {</span><br><span> LOGPNSE(nse, LOGL_INFO, "Rx %s: routing to NSE (LAI match)\n",</span><br><span> pdut_name);</span><br><span> gbprox_relay2peer(msg, bss_bvc, ns_bvci);</span><br><span>diff --git a/src/gb_proxy_ctrl.c b/src/gb_proxy_ctrl.c</span><br><span>index 10d3727..b6f01af 100644</span><br><span>--- a/src/gb_proxy_ctrl.c</span><br><span>+++ b/src/gb_proxy_ctrl.c</span><br><span>@@ -91,13 +91,12 @@</span><br><span> hash_for_each(cfg->bss_nses, i, nse_peer, list) {</span><br><span> struct gbproxy_bvc *bvc;</span><br><span> hash_for_each(nse_peer->bvcs, j, bvc, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ra_id raid;</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_parse_ra(&raid, bvc->ra);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ra_id *raid = &bvc->cell->id.raid;</span><br><span> </span><br><span> cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u-%u-%u-%u,%s\n",</span><br><span> nse_peer->nsei, bvc->bvci,</span><br><span style="color: hsl(0, 100%, 40%);">- raid.mcc, raid.mnc,</span><br><span style="color: hsl(0, 100%, 40%);">- raid.lac, raid.rac,</span><br><span style="color: hsl(120, 100%, 40%);">+ raid->mcc, raid->mnc,</span><br><span style="color: hsl(120, 100%, 40%);">+ raid->lac, raid->rac,</span><br><span> osmo_fsm_inst_state_name(bvc->fi));</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c</span><br><span>index fd4692d..9dbde58 100644</span><br><span>--- a/src/gb_proxy_vty.c</span><br><span>+++ b/src/gb_proxy_vty.c</span><br><span>@@ -78,10 +78,8 @@</span><br><span> vty_out(vty, "NSEI %5u, SIG-BVCI %5u [%s]%s", bvc->nse->nsei, bvc->bvci,</span><br><span> osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ra_id raid;</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_parse_ra(&raid, bvc->ra);</span><br><span> vty_out(vty, "NSEI %5u, PTP-BVCI %5u, RAI %s [%s]%s", bvc->nse->nsei, bvc->bvci,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_rai_name(&raid), osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_rai_name(&bvc->cell->id.raid), osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -100,12 +98,10 @@</span><br><span> </span><br><span> static void gbproxy_vty_print_cell(struct vty *vty, struct gbproxy_cell *cell, bool show_stats)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ra_id raid;</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_parse_ra(&raid, cell->ra);</span><br><span> unsigned int num_sgsn_bvc = 0;</span><br><span> unsigned int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BVCI %5u RAI %s: ", cell->bvci, osmo_rai_name(&raid));</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "BVCI %5u RAI %s CID %05u: ", cell->bvci, osmo_rai_name(&cell->id.raid), cell->id.cid);</span><br><span> if (cell->bss_bvc)</span><br><span> vty_out(vty, "BSS NSEI %5u, SGSN NSEI ", cell->bss_bvc->nse->nsei);</span><br><span> else</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653">change 22653</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/+/22653"/><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: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c </div>
<div style="display:none"> Gerrit-Change-Number: 22653 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </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: dexter <pmaier@sysmocom.de> </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>