<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add and set transport field for RanOps structure<br><br>This will allow RAN_Emulation to have better knowledge on the protocol<br>stack in use, and behave differently based on that information.<br>For intance, forthcoming commit will append OsmuxSupport IE only if<br>transport is BSSAP AoIP.<br><br>Change-Id: Ife62e328af2d3f2475ff93249f2138820c7ddabb<br>---<br>M bsc-nat/BSC_MS_ConnectionHandler.ttcn<br>M bsc-nat/MSC_ConnectionHandler.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>M library/RAN_Adapter.ttcnpp<br>M library/RAN_Emulation.ttcnpp<br>M msc/BSC_ConnectionHandler.ttcn<br>6 files changed, 13 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn</span><br><span>index f9f4db0..7f2ebcd 100644</span><br><span>--- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn</span><br><span>+++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn</span><br><span>@@ -63,7 +63,7 @@</span><br><span> decode_dtap := false,</span><br><span> role_ms := true,</span><br><span> protocol := RAN_PROTOCOL_BSSAP,</span><br><span style="color: hsl(0, 100%, 40%);">- /* Always false. We don't want to enable Osmux signalling in SCCPLite messages: */</span><br><span style="color: hsl(120, 100%, 40%);">+ transport := BSSAP_TRANSPORT_AoIP,</span><br><span> use_osmux := false,</span><br><span> sccp_addr_local := omit,</span><br><span> sccp_addr_peer := omit</span><br><span>diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn</span><br><span>index 89728b4..c8cb005 100644</span><br><span>--- a/bsc-nat/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc-nat/MSC_ConnectionHandler.ttcn</span><br><span>@@ -69,6 +69,7 @@</span><br><span> decode_dtap := false,</span><br><span> role_ms := false,</span><br><span> protocol := RAN_PROTOCOL_BSSAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ transport := BSSAP_TRANSPORT_AoIP,</span><br><span> use_osmux := false,</span><br><span> sccp_addr_local := omit,</span><br><span> sccp_addr_peer := omit</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index dbba135..3cc8f8a 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -394,6 +394,7 @@</span><br><span> decode_dtap := false,</span><br><span> role_ms := false,</span><br><span> protocol := RAN_PROTOCOL_BSSAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ transport := BSSAP_TRANSPORT_AoIP,</span><br><span> use_osmux := false,</span><br><span> sccp_addr_local := omit,</span><br><span> sccp_addr_peer := omit</span><br><span>diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp</span><br><span>index 30a1a9e..862921e 100644</span><br><span>--- a/library/RAN_Adapter.ttcnpp</span><br><span>+++ b/library/RAN_Adapter.ttcnpp</span><br><span>@@ -52,13 +52,6 @@</span><br><span> RAN_Emulation_CT vc_RAN</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-type enumerated RAN_Transport {</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP_TRANSPORT_AoIP, /* 3GPP AoIP: SCCP over M3UA over SCTP */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_TRANSPORT_IuCS /* 3GPP IuCS: SCCP over M3UA over SCTP */</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> type record RAN_Configuration {</span><br><span> RAN_Transport transport,</span><br><span> charstring sccp_service_type,</span><br><span>@@ -153,6 +146,7 @@</span><br><span> timer T := 5.0;</span><br><span> T.start;</span><br><span> //T.timeout;</span><br><span style="color: hsl(120, 100%, 40%);">+ ops.transport := cfg.transport;</span><br><span> /* connect BSSNAP component to upper side of SCCP */</span><br><span> if (cfg.transport == RANAP_TRANSPORT_IuCS) {</span><br><span> #ifdef RAN_EMULATION_RANAP</span><br><span>diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp</span><br><span>index 41aec47..85ae084 100644</span><br><span>--- a/library/RAN_Emulation.ttcnpp</span><br><span>+++ b/library/RAN_Emulation.ttcnpp</span><br><span>@@ -75,6 +75,13 @@</span><br><span> MSC_CONN_PRIM_CONF_IND</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type enumerated RAN_Transport {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP_TRANSPORT_AoIP, /* 3GPP AoIP: SCCP over M3UA over SCTP */</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */</span><br><span style="color: hsl(120, 100%, 40%);">+ RANAP_TRANSPORT_IuCS /* 3GPP IuCS: SCCP over M3UA over SCTP */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* similar to PDU_BSSAP with DTAP, but DTAP is already decoded! */</span><br><span> type record PDU_DTAP_MO {</span><br><span> OCT1 dlci optional,</span><br><span>@@ -650,6 +657,7 @@</span><br><span> boolean decode_dtap,</span><br><span> boolean role_ms,</span><br><span> RanProtocol protocol,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_Transport transport,</span><br><span> boolean use_osmux,</span><br><span> /* needed for performing BSSMAP RESET */</span><br><span> SCCP_PAR_Address sccp_addr_local optional,</span><br><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index b5dbb87..1dd4d05 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -222,6 +222,7 @@</span><br><span> decode_dtap := true,</span><br><span> role_ms := true,</span><br><span> protocol := RAN_PROTOCOL_BSSAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ transport := BSSAP_TRANSPORT_AoIP,</span><br><span> use_osmux := false,</span><br><span> sccp_addr_local := omit,</span><br><span> sccp_addr_peer := omit</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386">change 14386</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/+/14386"/><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: Ife62e328af2d3f2475ff93249f2138820c7ddabb </div>
<div style="display:none"> Gerrit-Change-Number: 14386 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>