<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn<br><br>This is the case for SCCPlite between BSC and MSC (or BSC-NAT). MGCP and<br>CTRL can be multiplexed over the same underlaying IPA conn.<br><br>Related: OS#2012<br>Change-Id: Id90c1609f0439b00379166fb9e4028d181fc023e<br>---<br>M library/RAN_Adapter.ttcnpp<br>M library/RAN_Emulation.ttcnpp<br>2 files changed, 48 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp</span><br><span>index 862921e..40cf0fa 100644</span><br><span>--- a/library/RAN_Adapter.ttcnpp</span><br><span>+++ b/library/RAN_Adapter.ttcnpp</span><br><span>@@ -167,6 +167,11 @@</span><br><span> log("Connecting MGCP RAN Emulation to IPA MGCP PORT");</span><br><span> connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP);</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span style="color: hsl(120, 100%, 40%);">+ /* connect IPA CTRL port with BSSMAP CTRL port */</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Connecting CTRL RAN Emulation to IPA CTRL PORT");</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(ba.vc_IPA:IPA_CTRL_PORT, ba.vc_RAN:CTRL);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> }</span><br><span> log("Starting RAN_Emulation");</span><br><span> ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), ""));</span><br><span>diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp</span><br><span>index ba018b4..cd0c867 100644</span><br><span>--- a/library/RAN_Emulation.ttcnpp</span><br><span>+++ b/library/RAN_Emulation.ttcnpp</span><br><span>@@ -36,6 +36,7 @@</span><br><span> import from SCCPasp_Types all;</span><br><span> import from IPA_Emulation all;</span><br><span> import from MobileL3_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Misc_Helpers all;</span><br><span> </span><br><span> #ifdef RAN_EMULATION_BSSAP</span><br><span> import from BSSAP_Types all;</span><br><span>@@ -48,6 +49,11 @@</span><br><span> import from MGCP_Templates all;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef RAN_EMULATION_CTRL</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_CTRL_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_CTRL_Adapter all;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #ifdef RAN_EMULATION_RANAP</span><br><span> import from RANAP_CodecPort all;</span><br><span> import from RANAP_PDU_Descriptions all;</span><br><span>@@ -177,6 +183,11 @@</span><br><span> /* MGCP port */</span><br><span> port IPA_MGCP_PT MGCP;</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef RAN_EMULATION_CTRL</span><br><span style="color: hsl(120, 100%, 40%);">+ /* CTRL port */</span><br><span style="color: hsl(120, 100%, 40%);">+ port IPA_CTRL_PT CTRL;</span><br><span style="color: hsl(120, 100%, 40%);">+ port IPA_CTRL_PT CTRL_CLIENT;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> /* use 16 as this is also the number of SCCP connections that SCCP_Emulation can handle */</span><br><span> var ConnectionData ConnectionTable[16];</span><br><span>@@ -1041,6 +1052,37 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_main_ctrl() runs on RAN_Emulation_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef RAN_EMULATION_CTRL</span><br><span style="color: hsl(120, 100%, 40%);">+ var CtrlMessage ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+ var RAN_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ var ASP_IPA_Event evt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Handling of CTRL in IPA SCCPLite case. This predates 3GPP AoIP</span><br><span style="color: hsl(120, 100%, 40%);">+ * and uses a CTRL session in parallel to BSSAP. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* CTRL_CLIENT -> CTRL */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CTRL_CLIENT.receive(CtrlMessage:?) -> value ctrl sender vc_conn {</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL.send(ctrl);</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%);">+ /* CTRL -> CTRL_CLIENT */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CTRL.receive(CtrlMessage:?) -> value ctrl {</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_CLIENT.send(ctrl);</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%);">+ [] CTRL.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) -> value evt {</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_CLIENT.send(evt);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CTRL.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Lost IPA connection!");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CTRL.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) {}</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ [false] CLIENT.receive {}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* send a raw (encoded) L3 message over given SCCP connection */</span><br><span> private function f_xmit_raw_l3(integer sccp_conn_id, OCT1 dlci, octetstring l3_enc) runs on RAN_Emulation_CT</span><br><span> {</span><br><span>@@ -1123,6 +1165,7 @@</span><br><span> }</span><br><span> </span><br><span> [] as_main_mgcp();</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_main_ctrl();</span><br><span> </span><br><span> [] PROC.getcall(RAN_register:{?,?}) -> param(l3_info, vc_hdlr) {</span><br><span> f_create_expect(l3_info, vc_hdlr);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406">change 14406</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/+/14406"/><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: Id90c1609f0439b00379166fb9e4028d181fc023e </div>
<div style="display:none"> Gerrit-Change-Number: 14406 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>