<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/25079">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP STATUS handling<br><br>Related: OS#4892<br>Change-Id: I29adb77a94ab759f5d557dada60b4b7df9616f17<br>---<br>M src/gb_proxy.c<br>1 file changed, 35 insertions(+), 17 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/79/25079/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 0815041..3826b0c 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -996,6 +996,7 @@</span><br><span> struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)pdu_data;</span><br><span> struct tlv_parsed tp_inner[2];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Parse partial messages as well */</span><br><span> rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data, pdu_len - sizeof(*bgph), 0, 0, DGPRS, "FOO");</span><br><span> </span><br><span> if (rc < 0)</span><br><span>@@ -1108,16 +1109,19 @@</span><br><span> {</span><br><span> /* Check if the status needs to be terminated locally */</span><br><span> uint8_t cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) {</span><br><span> /* Log and handle locally */</span><br><span> ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "%s Rx STATUS with cause %s for PtP-BVC %05u\n", log_pfx,</span><br><span style="color: hsl(0, 100%, 40%);">- bssgp_cause_str (cause), ptp_bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s) for PtP-BVC %05u\n", cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_cause_str(cause), ptp_bvci);</span><br><span> /* FIXME: Remove/block our BVC if present? */</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_INFO, "Forwarding STATUS with cause %s\n", bssgp_cause_str(cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_cause_str(cause));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gbproxy_sgsn *sgsn;</span><br><span> if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli) == 0) {</span><br><span> sgsn = gbproxy_select_sgsn(nse->cfg, &tlli);</span><br><span>@@ -1131,8 +1135,6 @@</span><br><span> }</span><br><span> </span><br><span> rc = gbprox_relay2nse(msg, sgsn->nse, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: inspect the erroneous PDU IE (if any) and check</span><br><span style="color: hsl(0, 100%, 40%);">- * if we can extract a TLLI/RNI to route it to the correct SGSN */</span><br><span> break;</span><br><span> }</span><br><span> case BSSGP_PDUT_RAN_INFO:</span><br><span>@@ -1468,20 +1470,36 @@</span><br><span> rc = gbprox_rx_paging(nse, msg, pdut_name, &tp[0], ns_bvci, paging_bc);</span><br><span> break;</span><br><span> case BSSGP_PDUT_STATUS:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Some exception has occurred */</span><br><span style="color: hsl(0, 100%, 40%);">- cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_nse *nse_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t tlli;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if the status needs to be terminated locally */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Log and handle locally */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s) for PtP-BVC %05u\n", cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_cause_str(cause), ptp_bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: Remove/block our BVC if present? */</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s)\n", cause,</span><br><span> bssgp_cause_str(cause));</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRES_LEN(&tp[0], BSSGP_IE_BVCI, 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DGPRS, LOGL_NOTICE, "BVCI=%05u\n", bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- /* don't send STATUS in response to STATUS if !bvc */</span><br><span style="color: hsl(0, 100%, 40%);">- if (sgsn_bvc && sgsn_bvc->cell && sgsn_bvc->cell->bss_bvc)</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gbprox_relay2peer(msg, sgsn_bvc->cell->bss_bvc, ns_bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DGPRS, LOGL_NOTICE, "\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nse_peer = gbproxy_nse_by_tlli(cfg, tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse_peer)</span><br><span style="color: hsl(120, 100%, 40%);">+ return gbprox_relay2nse(msg, nse_peer, 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%);">+ LOGPNSE(nse, LOGL_ERROR, "Unable to handle STATUS cause=0x%02x(%s)\n", cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_cause_str(cause));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* those only exist in the SGSN -> BSS direction */</span><br><span> case BSSGP_PDUT_SUSPEND_ACK:</span><br><span> case BSSGP_PDUT_SUSPEND_NACK:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/25079">change 25079</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/+/25079"/><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: I29adb77a94ab759f5d557dada60b4b7df9616f17 </div>
<div style="display:none"> Gerrit-Change-Number: 25079 </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>