<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse<br><br>Use the function provided by bssgp2 instead of setting up the ns2 prim<br>request ourself.<br><br>Related: OS#4889<br>Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564<br>---<br>M src/gb_proxy.c<br>1 file changed, 3 insertions(+), 10 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 34e63e3..8b57315 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -185,17 +185,13 @@</span><br><span>      /* create a copy of the message so the old one can</span><br><span>    * be free()d safely when we return from gbprox_rcvmsg() */</span><br><span>  struct gprs_ns2_inst *nsi = nse->cfg->nsi;</span><br><span style="color: hsl(0, 100%, 40%);">-        struct osmo_gprs_ns2_prim nsp = {};</span><br><span>  struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2nse");</span><br><span style="color: hsl(0, 100%, 40%);">-        uint32_t tlli;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint32_t tlli = 0;</span><br><span>   int rc;</span><br><span> </span><br><span>  DEBUGP(DGPRS, "NSE(%05u/%s)-BVC(%05u/??) proxying to NSE(%05u/%s)\n", msgb_nsei(msg),</span><br><span>             !nse->sgsn_facing ? "SGSN" : "BSS", ns_bvci, nse->nsei, nse->sgsn_facing ? "SGSN" : "BSS");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsp.bvci = ns_bvci;</span><br><span style="color: hsl(0, 100%, 40%);">-     nsp.nsei = nse->nsei;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     /* Strip the old NS header, it will be replaced with a new one */</span><br><span>    strip_ns_hdr(msg);</span><br><span> </span><br><span>@@ -204,12 +200,9 @@</span><br><span>         * all BSSGP UNITDATA PDUs related to an MS shall be passed with</span><br><span>      * the same LSP, e.g. the LSP contains the MS's TLLI, to the</span><br><span>      * underlying network service. */</span><br><span style="color: hsl(0, 100%, 40%);">-       if (gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), &tlli) == 1)</span><br><span style="color: hsl(0, 100%, 40%);">-               nsp.u.unitdata.link_selector = tlli;</span><br><span style="color: hsl(120, 100%, 40%);">+  gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), &tlli);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA,</span><br><span style="color: hsl(0, 100%, 40%);">-                  PRIM_OP_REQUEST, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-   rc = gprs_ns2_recv_prim(nsi, &nsp.oph);</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = bssgp2_nsi_tx_ptp(nsi, nse->nsei, ns_bvci, msg, tlli);</span><br><span>       /* FIXME: We need a counter group for gbproxy_nse */</span><br><span>         //if (rc < 0)</span><br><span>     //      rate_ctr_inc(&bvc->ctrg->ctr[GBPROX_PEER_CTR_TX_ERR]);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875">change 22875</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/+/22875"/><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: I0b8926eb903ed972edb2ed7ba3edbb3d77889564 </div>
<div style="display:none"> Gerrit-Change-Number: 22875 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>