<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22656">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP rim support<br><br>Change-Id: I11fbe29e73aa27ed5f87156ac612e6c0ad6ed788<br>---<br>M src/gb_proxy.c<br>1 file changed, 53 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/56/22656/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb_proxy.c b/src/gb_proxy.c</span><br><span>index 2dee5b2..bf5e544 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -46,6 +46,7 @@</span><br><span> #include <osmocom/gprs/gprs_bssgp2.h></span><br><span> #include <osmocom/gprs/gprs_bssgp_bss.h></span><br><span> #include <osmocom/gprs/bssgp_bvc_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gprs/protocol/gsm_08_18.h></span><br><span> </span><br><span> #include <osmocom/gsm/gsm23236.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span>@@ -973,9 +974,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 ensure 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>@@ -1275,9 +1301,32 @@</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%);">+ /* 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22656">change 22656</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/+/22656"/><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: I11fbe29e73aa27ed5f87156ac612e6c0ad6ed788 </div>
<div style="display:none"> Gerrit-Change-Number: 22656 </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>