Change in osmo-ttcn3-hacks[master]: RAN_Adapter: Support build without IPA / BSSAP support

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13750 )

Change subject: RAN_Adapter: Support build without IPA /  BSSAP support
......................................................................

RAN_Adapter: Support build without IPA /  BSSAP support

Change-Id: I5370f0ea6f2f6cfdc3370a6f3d3bf2e6c32af4d2
---
M library/RAN_Adapter.ttcnpp
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index a96c6ef..ae7934e 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -22,7 +22,9 @@
 import from SCTPasp_Types all;
 import from SCTPasp_PortType all;
 
+#ifdef RAN_EMULATION_BSSAP
 import from BSSMAP_Templates all;
+#endif
 import from RAN_Emulation all;
 
 type record RAN_Adapter {
@@ -96,6 +98,7 @@
 		connect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT);
 		ba.vc_M3UA.start(f_M3UA_Emulation(cfg.sctp_addr, cfg.rctx));
 		}
+#ifdef IPA_EMULATION_SCCP
 	case (BSSAP_TRANSPORT_SCCPlite_SERVER) {
 		ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA");
 		map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT);
@@ -129,7 +132,8 @@
 		ba.vc_WAIT.done;
 		disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT);
 		}
-#endif
+#endif /* SCCP */
+#endif /* BSSAP */
 	case else {
 		setverdict(fail, "Unsuppored RAN_Transport");
 		mtc.stop;
@@ -147,8 +151,10 @@
 #endif
 		if (cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER or
 		    cfg.transport == BSSAP_TRANSPORT_SCCPlite_CLIENT) {
+#ifdef IPA_EMULATION_MGCP
 			/* connect IPA MGCP port with BSSMAP MGCP port */
 			connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP);
+#endif
 		}
 		/* start the BSSMAP emulation */
 		ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), ""));

-- 
To view, visit https://gerrit.osmocom.org/13750
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I5370f0ea6f2f6cfdc3370a6f3d3bf2e6c32af4d2
Gerrit-Change-Number: 13750
Gerrit-PatchSet: 4
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190425/8e772502/attachment.htm>