<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Correctly extract TLLI from DL/UL unitdata<br><br>The unitdata PDUs have a different header structure so then need to be<br>parsed differently.<br><br>Fixes TTCN3 test TC_status_ptp_ul_tlli<br><br>Related: SYS#5235, OS#4892<br>Change-Id: I76896f2eee588c9a286b87b69b5b58232759a6d5<br>---<br>M src/gb_proxy.c<br>1 file changed, 14 insertions(+), 2 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/37/26037/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 7333e80..2be4b6b 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -1017,8 +1017,20 @@</span><br><span>    struct tlv_parsed tp_inner[2];</span><br><span> </span><br><span>   /* TODO: Parse partial messages as well */</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">-                                 pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (bgph->pdu_type == BSSGP_PDUT_UL_UNITDATA || bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) {</span><br><span style="color: hsl(120, 100%, 40%);">+             const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) (struct bssgp_ud_hdr *)pdu_data;</span><br><span style="color: hsl(120, 100%, 40%);">+            if (pdu_len < sizeof(*budh))</span><br><span style="color: hsl(120, 100%, 40%);">+                       return -EINVAL;</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, budh->data,</span><br><span style="color: hsl(120, 100%, 40%);">+                                       pdu_len - sizeof(*budh), 0, 0, DGPRS, log_pfx);</span><br><span style="color: hsl(120, 100%, 40%);">+              /* populate TLLI from the fixed headser into the TLV-parsed array so later code</span><br><span style="color: hsl(120, 100%, 40%);">+                * doesn't have to worry where the TLLI came from */</span><br><span style="color: hsl(120, 100%, 40%);">+              tp_inner[0].lv[BSSGP_IE_TLLI].len = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+                tp_inner[0].lv[BSSGP_IE_TLLI].val = (const uint8_t *) &budh->tlli;</span><br><span style="color: hsl(120, 100%, 40%);">+     } else {</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> </span><br><span>        if (rc < 0)</span><br><span>               return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037">change 26037</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/+/26037"/><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: I76896f2eee588c9a286b87b69b5b58232759a6d5 </div>
<div style="display:none"> Gerrit-Change-Number: 26037 </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>