<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  osmith: 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;">lib/IPA_Emulation: Build IPA_CTRL conditionally based on define<br><br>Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7<br>---<br>M bts/regen_makefile.sh<br>M library/IPA_Emulation.ttcnpp<br>M msc/regen_makefile.sh<br>M sccp/regen_makefile.sh<br>M selftest/regen_makefile.sh<br>M sgsn/regen_makefile.sh<br>M sip/regen_makefile.sh<br>7 files changed, 14 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh</span><br><span>index c912da8..9f1bf1d 100755</span><br><span>--- a/bts/regen_makefile.sh</span><br><span>+++ b/bts/regen_makefile.sh</span><br><span>@@ -2,6 +2,6 @@</span><br><span> </span><br><span> FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TRXC_CodecPort_CtrlFunctDef.cc L1CTL_PortType_CtrlFunctDef.cc TELNETasp_PT.cc"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_OML"</span><br><span style="color: hsl(120, 100%, 40%);">+export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_OML -DIPA_EMULATION_CTRL"</span><br><span> </span><br><span> ../regen-makefile.sh BTS_Tests.ttcn $FILES</span><br><span>diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp</span><br><span>index 3ec6922..2305b7b 100644</span><br><span>--- a/library/IPA_Emulation.ttcnpp</span><br><span>+++ b/library/IPA_Emulation.ttcnpp</span><br><span>@@ -186,8 +186,10 @@</span><br><span>        /* up-facing port for OML */</span><br><span>         port IPA_OML_PT IPA_OML_PORT;</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span>   /* up-facing port for CTRL */</span><br><span>        port IPA_CTRL_PT IPA_CTRL_PORT;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> #ifdef IPA_EMULATION_GSUP</span><br><span>         /* up-facing port for GSUP */</span><br><span>        port IPA_GSUP_PT IPA_GSUP_PORT;</span><br><span>@@ -300,9 +302,11 @@</span><br><span>               IPA_OML_PORT.send(evt);</span><br><span>      }</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span>       if (IPA_CTRL_PORT.checkstate("Connected")) {</span><br><span>               IPA_CTRL_PORT.send(evt);</span><br><span>     }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> #ifdef IPA_EMULATION_GSUP</span><br><span>       if (IPA_GSUP_PORT.checkstate("Connected")) {</span><br><span>               IPA_GSUP_PORT.send(evt);</span><br><span>@@ -497,10 +501,12 @@</span><br><span>     ScanEvents();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span> private function f_ctrl_to_user(octetstring msg) runs on IPA_Emulation_CT {</span><br><span>     var charstring msg_ch := oct2char(msg);</span><br><span>      IPA_CTRL_PORT.send(dec_CtrlMessage(msg_ch));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #ifdef IPA_EMULATION_GSUP</span><br><span> private function f_gsup_to_user(octetstring msg) runs on IPA_Emulation_CT {</span><br><span>@@ -703,11 +709,13 @@</span><br><span>            }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef IPA_EMULATION_CTRL</span><br><span>           [] IPA_CTRL_PORT.receive(CtrlMessage:?) -> value ctrl_msg {</span><br><span>                       payload := char2oct(enc_CtrlMessage(ctrl_msg));</span><br><span>                      ipa_ud := valueof(t_ASP_IPA_UD(IPAC_PROTO_OSMO, payload, IPAC_PROTO_EXT_CTRL));</span><br><span>                      IPA_PORT.send(f_from_asp(g_ipa_conn_id, ipa_ud));</span><br><span>            }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #ifdef IPA_EMULATION_GSUP</span><br><span>           [] IPA_GSUP_PORT.receive(GSUP_PDU:?) -> value gsup_msg {</span><br><span>diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh</span><br><span>index e89daa6..9278530 100755</span><br><span>--- a/msc/regen_makefile.sh</span><br><span>+++ b/msc/regen_makefile.sh</span><br><span>@@ -2,7 +2,7 @@</span><br><span> </span><br><span> FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc  SCTPasp_PT.cc  TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc TCCEncoding.cc SGsAP_CodecPort_CtrlFunctDef.cc RANAP_EncDec.cc *.c *.asn"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_RANAP -DUSE_MTP3_DISTRIBUTOR"</span><br><span style="color: hsl(120, 100%, 40%);">+export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DRAN_EMULATION_RANAP -DUSE_MTP3_DISTRIBUTOR"</span><br><span> </span><br><span> ../regen-makefile.sh MSC_Tests.ttcn $FILES</span><br><span> </span><br><span>diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh</span><br><span>index fc9e6d2..08db33e 100755</span><br><span>--- a/sccp/regen_makefile.sh</span><br><span>+++ b/sccp/regen_makefile.sh</span><br><span>@@ -2,6 +2,6 @@</span><br><span> </span><br><span> FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc  SCTPasp_PT.cc  TCCConversion.cc TCCInterface.cc UD_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc IPA_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc TCCEncoding.cc "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR"</span><br><span style="color: hsl(120, 100%, 40%);">+export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR"</span><br><span> </span><br><span> ../regen-makefile.sh SCCP_Tests.ttcn $FILES</span><br><span>diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh</span><br><span>index 2503fca..9d302ac 100755</span><br><span>--- a/selftest/regen_makefile.sh</span><br><span>+++ b/selftest/regen_makefile.sh</span><br><span>@@ -4,6 +4,6 @@</span><br><span> </span><br><span> FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DUSE_MTP3_DISTRIBUTOR"</span><br><span style="color: hsl(120, 100%, 40%);">+export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR"</span><br><span> </span><br><span> ../regen-makefile.sh $MAIN $FILES</span><br><span>diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh</span><br><span>index a85f79c..0cf2e64 100755</span><br><span>--- a/sgsn/regen_makefile.sh</span><br><span>+++ b/sgsn/regen_makefile.sh</span><br><span>@@ -2,6 +2,6 @@</span><br><span> </span><br><span> FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP"</span><br><span style="color: hsl(120, 100%, 40%);">+export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL"</span><br><span> </span><br><span> ../regen-makefile.sh SGSN_Tests.ttcn $FILES</span><br><span>diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh</span><br><span>index 86f71b8..722620b 100755</span><br><span>--- a/sip/regen_makefile.sh</span><br><span>+++ b/sip/regen_makefile.sh</span><br><span>@@ -3,6 +3,6 @@</span><br><span> FILES="*.ttcn *.ttcnpp TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc</span><br><span> IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SIPmsg_PT.cc *.c "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-export CPPFLAGS_TTCN3=""</span><br><span style="color: hsl(120, 100%, 40%);">+export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DRAN_EMULATION_CTRL"</span><br><span> </span><br><span> ../regen-makefile.sh SIP_Tests.ttcn $FILES</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418">change 14418</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/+/14418"/><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: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 </div>
<div style="display:none"> Gerrit-Change-Number: 14418 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </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-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>