Change in ...osmo-ttcn3-hacks[master]: Add and set transport field for RanOps structure

pespin gerrit-no-reply at lists.osmocom.org
Thu Jun 6 15:16:34 UTC 2019


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386


Change subject: Add and set transport field for RanOps structure
......................................................................

Add and set transport field for RanOps structure

This will allow RAN_Emulation to have better knowledge on the protocol
stack in use, and behave differently based on that information.
For intance, forthcoming commit will append OsmuxSupport IE only if
transport is BSSAP AoIP.

Change-Id: Ife62e328af2d3f2475ff93249f2138820c7ddabb
---
M bsc-nat/BSC_MS_ConnectionHandler.ttcn
M bsc-nat/MSC_ConnectionHandler.ttcn
M bsc/MSC_ConnectionHandler.ttcn
M library/RAN_Adapter.ttcnpp
M library/RAN_Emulation.ttcnpp
M msc/BSC_ConnectionHandler.ttcn
6 files changed, 13 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/14386/1

diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
index f9f4db0..7f2ebcd 100644
--- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn
+++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
@@ -63,7 +63,7 @@
 	decode_dtap := false,
 	role_ms := true,
 	protocol := RAN_PROTOCOL_BSSAP,
-	/* Always false. We don't want to enable Osmux signalling in SCCPLite messages: */
+	transport := BSSAP_TRANSPORT_AoIP,
 	use_osmux := false,
 	sccp_addr_local := omit,
 	sccp_addr_peer := omit
diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn
index 89728b4..c8cb005 100644
--- a/bsc-nat/MSC_ConnectionHandler.ttcn
+++ b/bsc-nat/MSC_ConnectionHandler.ttcn
@@ -69,6 +69,7 @@
 	decode_dtap := false,
 	role_ms := false,
 	protocol := RAN_PROTOCOL_BSSAP,
+	transport := BSSAP_TRANSPORT_AoIP,
 	use_osmux := false,
 	sccp_addr_local := omit,
 	sccp_addr_peer := omit
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index dbba135..3cc8f8a 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -394,6 +394,7 @@
 	decode_dtap := false,
 	role_ms := false,
 	protocol := RAN_PROTOCOL_BSSAP,
+	transport := BSSAP_TRANSPORT_AoIP,
 	use_osmux := false,
 	sccp_addr_local := omit,
 	sccp_addr_peer := omit
diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index 30a1a9e..862921e 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -52,13 +52,6 @@
 	RAN_Emulation_CT vc_RAN
 }
 
-type enumerated RAN_Transport {
-	BSSAP_TRANSPORT_AoIP,	/* 3GPP AoIP: SCCP over M3UA over SCTP */
-	BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */
-	BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */
-	RANAP_TRANSPORT_IuCS	/* 3GPP IuCS: SCCP over M3UA over SCTP */
-};
-
 type record RAN_Configuration {
 	RAN_Transport transport,
 	charstring sccp_service_type,
@@ -153,6 +146,7 @@
 		timer T := 5.0;
 		T.start;
 		//T.timeout;
+		ops.transport := cfg.transport;
 		/* connect BSSNAP component to upper side of SCCP */
 		if (cfg.transport == RANAP_TRANSPORT_IuCS) {
 #ifdef RAN_EMULATION_RANAP
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 41aec47..85ae084 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -75,6 +75,13 @@
 	MSC_CONN_PRIM_CONF_IND
 }
 
+type enumerated RAN_Transport {
+	BSSAP_TRANSPORT_AoIP,	/* 3GPP AoIP: SCCP over M3UA over SCTP */
+	BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */
+	BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */
+	RANAP_TRANSPORT_IuCS	/* 3GPP IuCS: SCCP over M3UA over SCTP */
+};
+
 /* similar to PDU_BSSAP with DTAP, but DTAP is already decoded! */
 type record PDU_DTAP_MO {
 	OCT1			dlci optional,
@@ -650,6 +657,7 @@
 	boolean decode_dtap,
 	boolean role_ms,
 	RanProtocol protocol,
+	RAN_Transport transport,
 	boolean use_osmux,
 	/* needed for performing BSSMAP RESET */
 	SCCP_PAR_Address sccp_addr_local optional,
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index b5dbb87..1dd4d05 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -222,6 +222,7 @@
 	decode_dtap := true,
 	role_ms := true,
 	protocol := RAN_PROTOCOL_BSSAP,
+	transport := BSSAP_TRANSPORT_AoIP,
 	use_osmux := false,
 	sccp_addr_local := omit,
 	sccp_addr_peer := omit

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ife62e328af2d3f2475ff93249f2138820c7ddabb
Gerrit-Change-Number: 14386
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190606/e84c2544/attachment.html>


More information about the gerrit-log mailing list