<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/25077">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Route BSSGP STATUS with PDU_IN_ERROR containing a TLLI<br><br>Fixes TC_status_sig_ul_tlli<br><br>Related: OS#4892<br>Change-Id: I9d2ec73520ee46ceedda3f7e63035e6a51a65ac2<br>---<br>M src/gb_proxy.c<br>1 file changed, 48 insertions(+), 2 deletions(-)<br><br></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 2029ca9..a45a83f 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -989,6 +989,28 @@</span><br><span> return gbprox_relay2nse(msg, sgsn->nse, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int gbproxy_tlli_from_status_pdu(struct msgb *msg, struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int pdu_len = TLVP_LEN(&tp[0], BSSGP_IE_PDU_IN_ERROR);</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *pdu_data = TLVP_VAL(&tp[0], BSSGP_IE_PDU_IN_ERROR);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)pdu_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed tp_inner[2];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&tp_inner[0], BSSGP_IE_TLLI))</span><br><span style="color: hsl(120, 100%, 40%);">+ *tlli = osmo_load32be(TLVP_VAL(&tp_inner[0], BSSGP_IE_TLLI));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOENT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Receive an incoming signalling message from a BSS-side NS-VC */</span><br><span> static int gbprox_rx_sig_from_bss(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci)</span><br><span> {</span><br><span>@@ -1079,9 +1101,33 @@</span><br><span> break;</span><br><span> }</span><br><span> case BSSGP_PDUT_STATUS:</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 style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_sgsn *sgsn;</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%);">+ 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%);">+ ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI));</span><br><span style="color: hsl(120, 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(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%);">+ LOGP(DGPRS, LOGL_INFO, "Forwarding STATUS with cause %s\n", bssgp_cause_str(cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn = gbproxy_select_sgsn(nse->cfg, &tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sgsn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EINVAL;</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%);">+ rc = 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_RAN_INFO:</span><br><span> case BSSGP_PDUT_RAN_INFO_REQ:</span><br><span> case BSSGP_PDUT_RAN_INFO_ACK:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/25077">change 25077</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/+/25077"/><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: I9d2ec73520ee46ceedda3f7e63035e6a51a65ac2 </div>
<div style="display:none"> Gerrit-Change-Number: 25077 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>