<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21131">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSGP_Emulation: Allow a "CreateCb" to handle unknown inbound TLLI<br><br>The existing BSSGP Code assumed that the TLLIs were always known "a<br>priori" by the test case. With the newly-introduced create_cb,<br>the user can provide a function to handle any incoming messages for an<br>unknown TLLL. The default handler behaves like before: fail +<br>terminate.<br><br>Change-Id: Ice0e145f5a6518ff79547dd851042b7965f38e00<br>---<br>M fr-net/FRNET_Tests.ttcn<br>M fr/FR_Tests.ttcn<br>M library/BSSGP_Emulation.ttcnpp<br>M pcu/SGSN_Components.ttcn<br>M sgsn/SGSN_Tests.ttcn<br>5 files changed, 33 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/21131/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/fr-net/FRNET_Tests.ttcn b/fr-net/FRNET_Tests.ttcn</span><br><span>index 721dd32..87b9bd7 100644</span><br><span>--- a/fr-net/FRNET_Tests.ttcn</span><br><span>+++ b/fr-net/FRNET_Tests.ttcn</span><br><span>@@ -65,7 +65,8 @@</span><br><span> },</span><br><span> cell_id := base + 600 + idx</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- depth := BSSGP_DECODE_DEPTH_LLC</span><br><span style="color: hsl(120, 100%, 40%);">+ depth := BSSGP_DECODE_DEPTH_LLC,</span><br><span style="color: hsl(120, 100%, 40%);">+ create_cb := refers(BSSGP_Emulation.DefaultCreateCallback)</span><br><span> };</span><br><span> return bvc;</span><br><span> }</span><br><span>diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn</span><br><span>index b220bb9..9f9b70e 100644</span><br><span>--- a/fr/FR_Tests.ttcn</span><br><span>+++ b/fr/FR_Tests.ttcn</span><br><span>@@ -66,7 +66,8 @@</span><br><span> },</span><br><span> cell_id := base + 600 + idx</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- depth := BSSGP_DECODE_DEPTH_LLC</span><br><span style="color: hsl(120, 100%, 40%);">+ depth := BSSGP_DECODE_DEPTH_LLC,</span><br><span style="color: hsl(120, 100%, 40%);">+ create_cb := refers(BSSGP_Emulation.DefaultCreateCallback)</span><br><span> };</span><br><span> return bvc;</span><br><span> }</span><br><span>diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp</span><br><span>index cb0c82c..63e11f2 100644</span><br><span>--- a/library/BSSGP_Emulation.ttcnpp</span><br><span>+++ b/library/BSSGP_Emulation.ttcnpp</span><br><span>@@ -681,7 +681,8 @@</span><br><span> type record BssgpBvcConfig {</span><br><span> BssgpBvci bvci,</span><br><span> BssgpCellId cell_id,</span><br><span style="color: hsl(0, 100%, 40%);">- BssgpDecodeDepth depth</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpDecodeDepth depth,</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpCreateCallback create_cb</span><br><span> };</span><br><span> type record of BssgpBvcConfig BssgpBvcConfigs;</span><br><span> type enumerated BssgpDecodeDepth {</span><br><span>@@ -693,6 +694,14 @@</span><br><span> BSSGP_DECODE_DEPTH_L3</span><br><span> #endif</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+/* call-back function type: Called for inbound BSSGP for unknown TLLIs; could create BSSGP_ClienT_CT */</span><br><span style="color: hsl(120, 100%, 40%);">+type function BssgpCreateCallback(BssgpBvci bvci, BssgpCellId cell_id, OCT4 tlli, BssgpDecoded dec) runs on BSSGP_BVC_CT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Default Create Callback function: Fail and terminate */</span><br><span style="color: hsl(120, 100%, 40%);">+function DefaultCreateCallback(BssgpBvci bvci, BssgpCellId cell_id, OCT4 tlli, BssgpDecoded dec) runs on BSSGP_BVC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Couldn't find Component for TLLI ", tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /*</span><br><span> private function f_tbl_init() runs on BSSGP_BVC_CT {</span><br><span>@@ -792,8 +801,7 @@</span><br><span> return ClientTable[i].comp_ref;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Couldn't find Component for TLLI ", tlli);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ return null;</span><br><span> }</span><br><span> </span><br><span> private function f_tbl_idx_by_comp(BSSGP_Client_CT comp_ref) runs on BSSGP_BVC_CT return integer {</span><br><span>@@ -987,7 +995,11 @@</span><br><span> var template OCT4 tlli := f_bssgp_get_tlli(udi.bssgp);</span><br><span> if (isvalue(tlli)) {</span><br><span> vc_conn := f_tbl_comp_by_tlli(valueof(tlli));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_bssgp_dec(dec, vc_conn, BSSGP_SP);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vc_conn == null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg.create_cb.apply(g_cfg.bvci, g_cfg.cell_id, valueof(tlli), dec);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_bssgp_dec(dec, vc_conn, BSSGP_SP);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else {</span><br><span> log("No TLLI: Broadcasting ", dec);</span><br><span> /* broadcast this message to all components */</span><br><span>@@ -1006,7 +1018,11 @@</span><br><span> var template OCT4 tlli := f_bssgp_get_tlli(udi.bssgp);</span><br><span> if (isvalue(tlli)) {</span><br><span> vc_conn := f_tbl_comp_by_tlli(valueof(tlli));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_bssgp_dec(dec, vc_conn, BSSGP_SP_SIG);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vc_conn == null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg.create_cb.apply(g_cfg.bvci, g_cfg.cell_id, valueof(tlli), dec);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_bssgp_dec(dec, vc_conn, BSSGP_SP_SIG);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else {</span><br><span> log("No TLLI: Broadcasting ", dec);</span><br><span> /* broadcast this message to all components */</span><br><span>diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn</span><br><span>index 5f05595..ca1dec6 100644</span><br><span>--- a/pcu/SGSN_Components.ttcn</span><br><span>+++ b/pcu/SGSN_Components.ttcn</span><br><span>@@ -33,7 +33,8 @@</span><br><span> },</span><br><span> cell_id := 20960</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- depth := BSSGP_DECODE_DEPTH_BSSGP</span><br><span style="color: hsl(120, 100%, 40%);">+ depth := BSSGP_DECODE_DEPTH_BSSGP,</span><br><span style="color: hsl(120, 100%, 40%);">+ create_cb := refers(BSSGP_Emulation.DefaultCreateCallback)</span><br><span> }</span><br><span> }</span><br><span> };</span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index a602b21..0b298bb 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -334,7 +334,8 @@</span><br><span> },</span><br><span> cell_id := 20960</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- depth := BSSGP_DECODE_DEPTH_L3</span><br><span style="color: hsl(120, 100%, 40%);">+ depth := BSSGP_DECODE_DEPTH_L3,</span><br><span style="color: hsl(120, 100%, 40%);">+ create_cb := refers(BSSGP_Emulation.DefaultCreateCallback)</span><br><span> }</span><br><span> }</span><br><span> };</span><br><span>@@ -354,7 +355,8 @@</span><br><span> },</span><br><span> cell_id := 20961</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- depth := BSSGP_DECODE_DEPTH_L3</span><br><span style="color: hsl(120, 100%, 40%);">+ depth := BSSGP_DECODE_DEPTH_L3,</span><br><span style="color: hsl(120, 100%, 40%);">+ create_cb := refers(BSSGP_Emulation.DefaultCreateCallback)</span><br><span> }</span><br><span> }</span><br><span> };</span><br><span>@@ -374,7 +376,8 @@</span><br><span> },</span><br><span> cell_id := 20962</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- depth := BSSGP_DECODE_DEPTH_L3</span><br><span style="color: hsl(120, 100%, 40%);">+ depth := BSSGP_DECODE_DEPTH_L3,</span><br><span style="color: hsl(120, 100%, 40%);">+ create_cb := refers(BSSGP_Emulation.DefaultCreateCallback)</span><br><span> }</span><br><span> }</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21131">change 21131</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/+/21131"/><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: Ice0e145f5a6518ff79547dd851042b7965f38e00 </div>
<div style="display:none"> Gerrit-Change-Number: 21131 </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-MessageType: newchange </div>