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
This commit is contained in:
parent
096d73dfc3
commit
c6b78ff2f9
|
@ -63,7 +63,7 @@ const RanOps BSC_MS_RanOps := {
|
|||
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
|
||||
|
|
|
@ -69,6 +69,7 @@ const RanOps MSC_RanOps := {
|
|||
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
|
||||
|
|
|
@ -394,6 +394,7 @@ const RanOps MSC_RanOps := {
|
|||
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
|
||||
|
|
|
@ -52,13 +52,6 @@ type record RAN_Adapter {
|
|||
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 @@ function f_ran_adapter_init(inout RAN_Adapter ba, in RAN_Configuration cfg, char
|
|||
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
|
||||
|
|
|
@ -75,6 +75,13 @@ type enumerated RAN_Conn_Prim {
|
|||
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 @@ type record RanOps {
|
|||
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,
|
||||
|
|
|
@ -222,6 +222,7 @@ const RanOps BSC_RanOps := {
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue