<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22314">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: WIP RIM support<br><br>Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a<br>---<br>M include/osmocom/sgsn/gb_proxy.h<br>M src/gbproxy/gb_proxy.c<br>M src/gbproxy/gb_proxy_peer.c<br>3 files changed, 72 insertions(+), 4 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/14/22314/1</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..f916b8f 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>@@ -112,6 +113,10 @@</span><br><span> </span><br><span> /* Routing Area that this BVC is part of (raw 04.08 encoding) */</span><br><span> uint8_t ra[6];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ra_id raid;</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>@@ -264,6 +269,7 @@</span><br><span> </span><br><span> struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci);</span><br><span> struct gbproxy_cell *gbproxy_cell_by_bvci(struct gbproxy_config *cfg, uint16_t bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid);</span><br><span> void gbproxy_cell_free(struct gbproxy_cell *cell);</span><br><span> bool gbproxy_cell_add_sgsn_bvc(struct gbproxy_cell *cell, struct gbproxy_bvc *bvc);</span><br><span> </span><br><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index edd9f29..63153a0 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -944,9 +944,34 @@</span><br><span> case BSSGP_PDUT_RAN_INFO_ACK:</span><br><span> case BSSGP_PDUT_RAN_INFO_ERROR:</span><br><span> case BSSGP_PDUT_RAN_INFO_APP_ERROR:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: route based in RIM Routing IE */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_cell *cell;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_sgsn *sgsn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_rim_routing_info ri;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Check the RIM src addr and insure it matches a Cell we have for this BSS */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reply with STATUS if BSSGP didn't negotiate RIM feature */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: Check negotiated features</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg);</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%);">+ rc = bssgp_parse_rim_ri(&ri, TLVP_VAL(&tp, BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp, BSSGP_IE_RIM_ROUTING_INFO));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check RIM destination addr */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ri.discr == BSSGP_RIM_ROUTING_INFO_GERAN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cell = gbproxy_cell_by_cellid(nse->cfg, &ri.geran.raid, ri.geran.cid);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cell) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Destination is known by gbproxy, route directly */</span><br><span style="color: hsl(120, 100%, 40%);">+ return gbprox_relay2peer(msg, cell->bss_bvc, 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%);">+ /* Otherwise pass on to a RIM-capable SGSN */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Check SGSN is RIM-capable */</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn = gbproxy_select_sgsn(nse->cfg, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbprox_relay2nse(msg, sgsn->nse, 0);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> case BSSGP_PDUT_LLC_DISCARD:</span><br><span> case BSSGP_PDUT_FLUSH_LL_ACK:</span><br><span> /* route based on BVCI + TLLI */</span><br><span>@@ -1242,9 +1267,33 @@</span><br><span> case BSSGP_PDUT_RAN_INFO_ACK:</span><br><span> case BSSGP_PDUT_RAN_INFO_ERROR:</span><br><span> case BSSGP_PDUT_RAN_INFO_APP_ERROR:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: route based in RIM Routing IE */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_cell *cell;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_rim_routing_info ri;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Check the RIM src addr and insure it matches a Cell we have for this BSS */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reply with STATUS if BSSGP didn't negotiate RIM feature */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: Check negotiated features</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg);</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%);">+ rc = bssgp_parse_rim_ri(&ri, TLVP_VAL(&tp, BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp, BSSGP_IE_RIM_ROUTING_INFO));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check RIM destination addr */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ri.discr == BSSGP_RIM_ROUTING_INFO_GERAN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cell = gbproxy_cell_by_cellid(cfg, &ri.geran.raid, ri.geran.cid);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Log error */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ return gbprox_relay2peer(msg, cell->bss_bvc, 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%);">+ /* If it's not a GERAN Cell or it's a Cell gbproxy doesn't know about: Return STATUS PDU with</span><br><span style="color: hsl(120, 100%, 40%);">+ * "Unknown Destination Address" */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bssgp_tx_status(BSSGP_CAUSE_UNKN_DST, NULL, msg);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> default:</span><br><span> LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]);</span><br><span>diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c</span><br><span>index 7d6ba86..dd914fa 100644</span><br><span>--- a/src/gbproxy/gb_proxy_peer.c</span><br><span>+++ b/src/gbproxy/gb_proxy_peer.c</span><br><span>@@ -206,6 +206,19 @@</span><br><span> return cell;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_cell *cell;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hash_for_each(cfg->cells, i, cell, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((cell->id.cid == cid) && (!memcmp(&cell->id.raid, raid, sizeof(*raid)))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return cell;</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%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void gbproxy_cell_free(struct gbproxy_cell *cell)</span><br><span> {</span><br><span> unsigned int i;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22314">change 22314</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/+/22314"/><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: I3403736eed9d6819634c26db0b90393ac6f4416a </div>
<div style="display:none"> Gerrit-Change-Number: 22314 </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>