<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20450">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSGP_Emulation: Only add CellId to BVC-RESET[-ACK] conditionally<br><br>We always used to include the CellID IE, but 3GPP TS 48.018 is<br>actually quite specific about when it should be present and when not.<br><br>Change-Id: Iffd023f0272c9ccb087bdd225fcfb08424a46bdf<br>---<br>M library/BSSGP_Emulation.ttcnpp<br>1 file changed, 25 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp</span><br><span>index 185fd82..931ff37 100644</span><br><span>--- a/library/BSSGP_Emulation.ttcnpp</span><br><span>+++ b/library/BSSGP_Emulation.ttcnpp</span><br><span>@@ -236,8 +236,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_sendReset() runs on BSSGP_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP pdu := valueof(ts_BVC_RESET(BSSGP_CAUSE_OM_INTERVENTION, g_cfg.bvci, g_cfg.cell_id));</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_sendReset(BssgpBvci bvci) runs on BSSGP_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP pdu;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The Cell Identifier IE is mandatory in the BVC-RESET PDU sent from BSS to</span><br><span style="color: hsl(120, 100%, 40%);">+ * SGSN in order to reset a BVC corresponding to a PTP functional entity. The</span><br><span style="color: hsl(120, 100%, 40%);">+ * Cell Identifier IE shall not be used in any other BVC-RESET PDU. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_cfg.sgsn_role) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu := valueof(ts_BVC_RESET(BSSGP_CAUSE_OM_INTERVENTION, bvci, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu := valueof(ts_BVC_RESET(BSSGP_CAUSE_OM_INTERVENTION, bvci, g_cfg.cell_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> log("PDU: ", pdu);</span><br><span> log("ENC: ", enc_PDU_BSSGP(pdu));</span><br><span> </span><br><span>@@ -435,6 +444,17 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_send_bvc_reset_ack(BssgpBvci bvci) runs on BSSGP_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The Cell Identifier IE is mandatory in the BVC-RESET-ACK PDU sent from BSS to</span><br><span style="color: hsl(120, 100%, 40%);">+ * SGSN in response to reset a BVC corresponding to a PTP functional entity. The Cell</span><br><span style="color: hsl(120, 100%, 40%);">+ * Identifier IE shall not be used in any other BVC-RESET-ACK PDU */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_cfg.sgsn_role) {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(bvci, omit), 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(bvci, g_cfg.cell_id), 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%);">+</span><br><span> altstep as_allstate() runs on BSSGP_CT {</span><br><span> var BSSGP_Client_CT vc_conn;</span><br><span> var NsUnitdataIndication udi;</span><br><span>@@ -453,14 +473,14 @@</span><br><span> /* Respond to RESET with correct BVCI/CellID */</span><br><span> [] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, g_cfg.bvci, g_cfg.cell_id), 0)) -> value udi {</span><br><span> log("Rx BVC-RESET for Our BVCI=", g_cfg.bvci);</span><br><span style="color: hsl(0, 100%, 40%);">- BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(g_cfg.bvci, g_cfg.cell_id), 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_bvc_reset_ack(g_cfg.bvci);</span><br><span> f_change_state(BVC_S_UNBLOCKED);</span><br><span> }</span><br><span> </span><br><span> /* Respond to RESET for signalling BVCI 0 */</span><br><span> [] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, g_cfg.cell_id), 0)) -> value udi {</span><br><span> log("Rx BVC-RESET for Signaling BVCI=0");</span><br><span style="color: hsl(0, 100%, 40%);">- BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, g_cfg.cell_id), 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_bvc_reset_ack(0);</span><br><span> }</span><br><span> </span><br><span> /* Respond to RESET with wrong NSEI/NSVCI */</span><br><span>@@ -486,7 +506,7 @@</span><br><span> /* if we just became NS-unblocked, send a BCC-RESET */</span><br><span> if (nsi.old_state != NSE_S_ALIVE_UNBLOCKED and nsi.new_state == NSE_S_ALIVE_UNBLOCKED) {</span><br><span> if (g_cfg.sgsn_role == false) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_sendReset();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendReset(g_cfg.bvci);</span><br><span> }</span><br><span> /* Idea: We could send BVC-UNBLOCK here like some SGSN do */</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20450">change 20450</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-ttcn3-hacks/+/20450"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iffd023f0272c9ccb087bdd225fcfb08424a46bdf </div>
<div style="display:none"> Gerrit-Change-Number: 20450 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>