- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: RAN_{Emulation,Adapter}: Split transport type from transport client/s...
by pespin 19 Sep '25

19 Sep '25

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41132?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: RAN_{Emulation,Adapter}: Split transport type from transport client/server mode ...................................................................... RAN_{Emulation,Adapter}: Split transport type from transport client/server mode The RAN_Transport is used to identify the stack of protocols in use up to SCCP. The client/server mode is some extra independent information. For instance, RAN_Emulation doesn't really use it while RAN_Adapter does, since the later is the one in charge of setting up the lower layer socket connection. Change-Id: Ib2e7d029bd7eb59cc6f3b3a28bc417f00d3fed9c --- M bsc/BSC_Tests.default M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_SCCPlite.cfg M hnbgw/HNBGW_Tests.default M library/RAN_Adapter.ttcnpp M library/RAN_Emulation.ttcnpp M msc/MSC_Tests.default M sgsn/SGSN_Tests.default 8 files changed, 46 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/41132/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2e7d029bd7eb59cc6f3b3a28bc417f00d3fed9c Gerrit-Change-Number: 41132 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: Split SCCP_Adapter out of RAN_Adapter
by pespin 19 Sep '25

19 Sep '25

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41133?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Split SCCP_Adapter out of RAN_Adapter ...................................................................... Split SCCP_Adapter out of RAN_Adapter RAN_Adapter has further features and goes up in the stack, while sometimes getting an SCCP SAP is enough, eg. when doing stuf with SIGTRAN on the Core Network (eg. TCAP). Change-Id: I0558d74d53ceb1b33c4f3d583f1b4489f6d7ee60 --- M bsc/BSC_Tests.default M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_ASCI.ttcn M bsc/BSC_Tests_SCCPlite.cfg M bsc/gen_links.sh M hnbgw/HNBGW_Tests.default M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M library/RAN_Adapter.ttcnpp A library/SCCP_Adapter.ttcnpp M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh M sgsn/SGSN_Tests.default M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn M sgsn/gen_links.sh 17 files changed, 548 insertions(+), 378 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/41133/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41133?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0558d74d53ceb1b33c4f3d583f1b4489f6d7ee60 Gerrit-Change-Number: 41133 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[M] Change in osmo-ttcn3-hacks[master]: RAN_{Emulation,Adapter}: Split transport type from transport client/s...
by pespin 19 Sep '25

19 Sep '25

Attention is currently required from: pespin. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41132?usp=email ) Change subject: RAN_{Emulation,Adapter}: Split transport type from transport client/server mode ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: If one looks in detail it can be seen that the "transport_is_server" flag is really not used in M3UA (SIGTRAN) based connections (it's controlled by a module param in M3UA_Emulation coming from deps/), but anyway this gets changed in a follow-up commit, so take this a transitional change easing refactoring. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2e7d029bd7eb59cc6f3b3a28bc417f00d3fed9c Gerrit-Change-Number: 41132 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Sep 2025 16:08:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ttcn3-hacks[master]: SCCP_Adapter: Allow configuring ipa_ccm_pars in SCCPLite transport
by pespin 19 Sep '25

19 Sep '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41134?usp=email ) Change subject: SCCP_Adapter: Allow configuring ipa_ccm_pars in SCCPLite transport ...................................................................... SCCP_Adapter: Allow configuring ipa_ccm_pars in SCCPLite transport This is needed for instance to set ipa_unit_id, which must match the AS name configured at the STP. Change-Id: I16e1f5d0c40c03330642b2781dc6ddae81d821b2 --- M bsc/BSC_Tests_SCCPlite.cfg M library/SCCP_Adapter.ttcnpp 2 files changed, 23 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/41134/1 diff --git a/bsc/BSC_Tests_SCCPlite.cfg b/bsc/BSC_Tests_SCCPlite.cfg index e4f4068..7e5b4b2 100644 --- a/bsc/BSC_Tests_SCCPlite.cfg +++ b/bsc/BSC_Tests_SCCPlite.cfg @@ -21,7 +21,8 @@ tpars := { sccplite := { tcp_addr := { 5000, "127.0.0.1", 4000, "" }, - tcp_is_server := true + tcp_is_server := true, + ipa_ccm_pars := omit } }, sccp_service_type := "mtp3_itu", diff --git a/library/SCCP_Adapter.ttcnpp b/library/SCCP_Adapter.ttcnpp index 6945255..de01b0e 100644 --- a/library/SCCP_Adapter.ttcnpp +++ b/library/SCCP_Adapter.ttcnpp @@ -44,7 +44,8 @@ type record SCCP_Adapter_Config_Sccplite { SCTP_Association_Address tcp_addr, - boolean tcp_is_server + boolean tcp_is_server, + IPA_CCM_Parameters ipa_ccm_pars optional }; type union SCCP_Adapter_Transport_ConfigUnion { @@ -96,6 +97,13 @@ }; ba.sccp_addr_own := valueof(ts_SccpAddr_PC_SSN(cfg.own_pc, cfg.own_ssn, cfg.sio, cfg.sccp_service_type)); ba.sccp_addr_peer := valueof(ts_SccpAddr_PC_SSN(cfg.peer_pc, cfg.peer_ssn, cfg.sio, cfg.sccp_service_type)); + + if (ischosen(cfg.tpars.sccplite)) { + if (not ispresent(cfg.tpars.sccplite.ipa_ccm_pars)) { + cfg.tpars.sccplite.ipa_ccm_pars := c_IPA_default_ccm_pars; + } + } + ba.cfg := cfg; } @@ -104,19 +112,19 @@ /* create components */ ba.vc_SCCP := SCCP_CT.create(id & "-SCCP") alive; - select (cfg.transport) { + select (ba.cfg.transport) { case (SCCP_TRANSPORT_SIGTRAN) { var template (omit) integer rctx; - if (not ispresent(cfg.rctx)) { + if (not ispresent(ba.cfg.rctx)) { rctx := omit; } else { - rctx := cfg.rctx; + rctx := ba.cfg.rctx; } ba.vc_M3UA := M3UA_CT.create(id & "-M3UA") alive; map(ba.vc_M3UA:SCTP_PORT, system:sctp); /* connect MTP3 service provider (M3UA) to lower side of SCCP */ connect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); - ba.vc_M3UA.start(f_M3UA_Emulation(cfg.tpars.sigtran.sctp_addr, rctx)); + ba.vc_M3UA.start(f_M3UA_Emulation(ba.cfg.tpars.sigtran.sctp_addr, rctx)); } #ifdef IPA_EMULATION_SCCP case (SCCP_TRANSPORT_SCCPlite) { @@ -128,15 +136,16 @@ ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive; connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); ba.vc_WAIT.start(IPA_Emulation.waiter_main()); - if (cfg.tpars.sccplite.tcp_is_server) { - ba.vc_IPA.start(IPA_Emulation.main_server(cfg.tpars.sccplite.tcp_addr.local_ip_addr, - cfg.tpars.sccplite.tcp_addr.local_sctp_port, + if (ba.cfg.tpars.sccplite.tcp_is_server) { + ba.vc_IPA.start(IPA_Emulation.main_server(ba.cfg.tpars.sccplite.tcp_addr.local_ip_addr, + ba.cfg.tpars.sccplite.tcp_addr.local_sctp_port, true, IPA_INIT_SEND_IPA_ID_ACK)); } else { - ba.vc_IPA.start(IPA_Emulation.main_client(cfg.tpars.sccplite.tcp_addr.remote_ip_addr, - cfg.tpars.sccplite.tcp_addr.remote_sctp_port, - cfg.tpars.sccplite.tcp_addr.local_ip_addr, - cfg.tpars.sccplite.tcp_addr.local_sctp_port)); + ba.vc_IPA.start(IPA_Emulation.main_client(ba.cfg.tpars.sccplite.tcp_addr.remote_ip_addr, + ba.cfg.tpars.sccplite.tcp_addr.remote_sctp_port, + ba.cfg.tpars.sccplite.tcp_addr.local_ip_addr, + ba.cfg.tpars.sccplite.tcp_addr.local_sctp_port, + ba.cfg.tpars.sccplite.ipa_ccm_pars)); } /* wait until we received an IPA CCM ID_ACK */ ba.vc_WAIT.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41134?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16e1f5d0c40c03330642b2781dc6ddae81d821b2 Gerrit-Change-Number: 41134 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: RAN_{Emulation,Adapter}: Split transport type from transport client/s...
by pespin 19 Sep '25

19 Sep '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41132?usp=email ) Change subject: RAN_{Emulation,Adapter}: Split transport type from transport client/server mode ...................................................................... RAN_{Emulation,Adapter}: Split transport type from transport client/server mode The RAN_Transport is used to identify the stack of protocols in use up to SCCP. The client/server mode is some extra independent information. For instance, RAN_Emulation doesn't really use it while RAN_Adapter does, since the later is the one in charge of setting up the lower layer socket connection. Change-Id: Ib2e7d029bd7eb59cc6f3b3a28bc417f00d3fed9c --- M bsc/BSC_Tests.default M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_SCCPlite.cfg M hnbgw/HNBGW_Tests.default M library/RAN_Adapter.ttcnpp M library/RAN_Emulation.ttcnpp M msc/MSC_Tests.default M sgsn/SGSN_Tests.default 8 files changed, 47 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/41132/1 diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default index d14fa6c..2c65b18 100644 --- a/bsc/BSC_Tests.default +++ b/bsc/BSC_Tests.default @@ -41,6 +41,7 @@ BSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23905, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 185, # 0.23.1 first MSC emulation @@ -52,6 +53,7 @@ }, { transport := BSSAP_TRANSPORT_AoIP, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 2, # 0.0.2 second MSC emulation @@ -63,6 +65,7 @@ }, { transport := BSSAP_TRANSPORT_AoIP, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 3, # 0.0.3 third MSC emulation diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 1559d6c..e6260b3 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1066,7 +1066,7 @@ mgw_udp_port := 2427 + mgw_nr, /* Enable it for SCCPlite, since we have 2 MGCP sockets towards MGW (UDP one + the one with MGCP over IPA forwarded from MSC one) */ - multi_conn_mode := (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_SCCPlite_SERVER) + multi_conn_mode := (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_SCCPlite) }; vc_MGCP[mgw_nr] := MGCP_Emulation_CT.create(id) alive; @@ -12675,7 +12675,7 @@ execute( TC_stat_msc_sctp_disconnected() ); } execute( TC_ctrl() ); - if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_SCCPlite_SERVER) { + if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_SCCPlite) { execute( TC_ctrl_location() ); } diff --git a/bsc/BSC_Tests_SCCPlite.cfg b/bsc/BSC_Tests_SCCPlite.cfg index 9a1a1b3..c5f46c9 100644 --- a/bsc/BSC_Tests_SCCPlite.cfg +++ b/bsc/BSC_Tests_SCCPlite.cfg @@ -15,7 +15,8 @@ [MODULE_PARAMETERS] BSC_Tests.mp_bssap_cfg := { { - transport := BSSAP_TRANSPORT_SCCPlite_SERVER, + transport := BSSAP_TRANSPORT_SCCPlite, + transport_is_server := true, sccp_service_type := "mtp3_itu", sctp_addr := { 5000, "127.0.0.1", 4000, "" }, own_pc := 185, # 0.23.1 first MSC emulation diff --git a/hnbgw/HNBGW_Tests.default b/hnbgw/HNBGW_Tests.default index 107d15c..f44ccc5 100644 --- a/hnbgw/HNBGW_Tests.default +++ b/hnbgw/HNBGW_Tests.default @@ -37,6 +37,7 @@ HNBGW_Tests.mp_cn_cfg := { { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23905, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 185, # 0.23.1 first MSC emulation @@ -48,6 +49,7 @@ }, { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 2, # 0.0.2 second MSC emulation @@ -59,6 +61,7 @@ }, { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23909, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 3, # 0.0.3 third MSC emulation @@ -70,6 +73,7 @@ }, { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23911, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 4, # 0.0.4 fourth MSC emulation @@ -82,6 +86,7 @@ # SGSNs (NUM_SGSN entries) { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 188, # 0.23.4 first SGSN emulation @@ -93,6 +98,7 @@ }, { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23908, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 10, # 0.1.2 second SGSN emulation @@ -104,6 +110,7 @@ }, { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23910, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 11, # 0.1.3 third SGSN emulation @@ -115,6 +122,7 @@ }, { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23912, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 12, # 0.1.4 fourth SGSN emulation diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index 04a9bf0..d1cd85c 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -48,6 +48,7 @@ SCCP_PAR_Address sccp_addr_own, SCCP_PAR_Address sccp_addr_peer, RAN_Transport transport, + boolean transport_is_server, /* handler mode */ RAN_Emulation_CT vc_RAN @@ -55,6 +56,7 @@ type record RAN_Configuration { RAN_Transport transport, + boolean transport_is_server, charstring sccp_service_type, SCTP_Association_Address sctp_addr, integer own_pc, @@ -82,6 +84,7 @@ ba.sccp_addr_own := valueof(ts_SccpAddr_PC_SSN(cfg.own_pc, cfg.own_ssn, cfg.sio, cfg.sccp_service_type)); ba.sccp_addr_peer := valueof(ts_SccpAddr_PC_SSN(cfg.peer_pc, cfg.peer_ssn, cfg.sio, cfg.sccp_service_type)); ba.transport := cfg.transport; + ba.transport_is_server := cfg.transport_is_server; } @@ -113,40 +116,31 @@ ba.vc_M3UA.start(f_M3UA_Emulation(cfg.sctp_addr, rctx)); } #ifdef IPA_EMULATION_SCCP - case (BSSAP_TRANSPORT_SCCPlite_SERVER) { - ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA") alive; - map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); - /* connect MTP3 service provider (IPA) to lower side of SCCP */ - connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); - /* connect waiter to general IPA port (for ASP_IPA_Event) */ - ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive; - connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); - ba.vc_WAIT.start(IPA_Emulation.waiter_main()); - ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr, - cfg.sctp_addr.local_sctp_port, - true, IPA_INIT_SEND_IPA_ID_ACK)); - /* wait until we received an IPA CCM ID_ACK */ - ba.vc_WAIT.done; - disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + case (SCCP_TRANSPORT_SCCPlite) { + ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA") alive; + map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); + /* connect MTP3 service provider (IPA) to lower side of SCCP */ + connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + /* connect waiter to general IPA port (for ASP_IPA_Event) */ + ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive; + connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + ba.vc_WAIT.start(IPA_Emulation.waiter_main()); + if (cfg.transport_is_server) { + ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr, + cfg.sctp_addr.local_sctp_port, + true, IPA_INIT_SEND_IPA_ID_ACK)); + } else { + ba.vc_IPA.start(IPA_Emulation.main_client(cfg.sctp_addr.remote_ip_addr, + cfg.sctp_addr.remote_sctp_port, + cfg.sctp_addr.local_ip_addr, + cfg.sctp_addr.local_sctp_port, + ba.ipa_ccm_pars)); } - case (BSSAP_TRANSPORT_SCCPlite_CLIENT) { - ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA") alive; - map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); - /* connect MTP3 service provider (IPA) to lower side of SCCP */ - connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); - /* connect waiter to general IPA port (for ASP_IPA_Event) */ - ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive; - connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); - ba.vc_WAIT.start(IPA_Emulation.waiter_main()); - ba.vc_IPA.start(IPA_Emulation.main_client(cfg.sctp_addr.remote_ip_addr, - cfg.sctp_addr.remote_sctp_port, - cfg.sctp_addr.local_ip_addr, - cfg.sctp_addr.local_sctp_port)); - /* wait until we received an IPA CCM ID_ACK */ - ba.vc_WAIT.done; - disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + /* wait until we received an IPA CCM ID_ACK */ + ba.vc_WAIT.done; + disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); } -#endif /* SCCP */ +#endif /* IPA_EMULATION_SCCP */ case else { setverdict(fail, "Unsuppored RAN_Transport"); mtc.stop; @@ -171,8 +165,7 @@ connect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); #endif } - if (cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER or - cfg.transport == BSSAP_TRANSPORT_SCCPlite_CLIENT) { + if (cfg.transport == BSSAP_TRANSPORT_SCCPlite) { #ifdef IPA_EMULATION_MGCP /* connect IPA MGCP port with BSSMAP MGCP port */ log("Connecting MGCP RAN Emulation to IPA MGCP PORT"); diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 8ebe6de..bc691a6 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -129,8 +129,7 @@ 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 */ + BSSAP_TRANSPORT_SCCPlite, /* SCCPlite: SCCP over IPA over TCP */ RANAP_TRANSPORT_IuCS /* 3GPP IuCS: SCCP over M3UA over SCTP */ }; diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default index 149d8e7..a89101b 100644 --- a/msc/MSC_Tests.default +++ b/msc/MSC_Tests.default @@ -47,6 +47,7 @@ MSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 193, @@ -58,6 +59,7 @@ }, { transport := BSSAP_TRANSPORT_AoIP, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 194, @@ -69,6 +71,7 @@ }, { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23908, "127.0.0.1", 2905, "127.0.0.1" }, own_pc := 195, diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index 04f4e09..b31d86c 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -42,6 +42,7 @@ SGSN_Tests.mp_ranap_cfg := { { transport := RANAP_TRANSPORT_IuCS, + transport_is_server := false, sccp_service_type := "mtp3_itu", sctp_addr := { 23908, "127.0.0.104", 2905, "127.0.0.200" }, own_pc := 195, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2e7d029bd7eb59cc6f3b3a28bc417f00d3fed9c Gerrit-Change-Number: 41132 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: WIP: IPA: Introduce new OSMO extension TCAP_ROUTING
by pespin 19 Sep '25

19 Sep '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41135?usp=email ) Change subject: WIP: IPA: Introduce new OSMO extension TCAP_ROUTING ...................................................................... WIP: IPA: Introduce new OSMO extension TCAP_ROUTING As currently being developed in libosmo-sigtran.git branch "daniel/wip". Related: SYS#5423 Change-Id: Ibfcf633f7bd8773f557901fdff7580f5879391a1 --- A library/IPA_EXT_TCAP_ROUTING.ttcn M library/IPA_Emulation.ttcnpp M library/IPA_Types.ttcn 3 files changed, 133 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/41135/1 diff --git a/library/IPA_EXT_TCAP_ROUTING.ttcn b/library/IPA_EXT_TCAP_ROUTING.ttcn new file mode 100644 index 0000000..82e1cdf --- /dev/null +++ b/library/IPA_EXT_TCAP_ROUTING.ttcn @@ -0,0 +1,89 @@ +/* IPA Osmo Extension: TCAP_ROUTING, used to set up TCAP routes in osmo-stp. + * (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module IPA_EXT_TCAP_ROUTING { + +import from General_Types all; +import from Osmocom_Types all; +import from Native_Functions all; + +type enumerated IPA_EXT_TCAP_ROUTING_MsgType { + IPA_EXT_TCAP_ROUTING_MSG_TID_ADD_RANGE ('01'O), + IPA_EXT_TCAP_ROUTING_MSG_TID_ACK ('02'O), + IPA_EXT_TCAP_ROUTING_MSG_TID_NACK ('03'O) +} with { variant "FIELDLENGTH(8)" }; + +type record IPA_EXT_TCAP_ROUTING_Hdr { + IPA_EXT_TCAP_ROUTING_MsgType msg_type, + uint32_t seq_nr +} with { variant "" }; + +type record IPA_EXT_TCAP_ROUTING_ADD_RANGE { + uint32_t tid_start, + uint32_t tid_end, + uint32_t pc, + uint8_t ssn +} with { variant "" }; + +type record IPA_EXT_TCAP_ROUTING_ACK { +} with { variant "" }; + +type record IPA_EXT_TCAP_ROUTING_NACK { + uint8_t cause +} with { variant "" }; + +type union IPA_EXT_TCAP_ROUTING_MsgUnion { + IPA_EXT_TCAP_ROUTING_ADD_RANGE add_range, + IPA_EXT_TCAP_ROUTING_ACK ack, + IPA_EXT_TCAP_ROUTING_NACK nack +} with { variant "" }; + +type record IPA_EXT_TCAP_ROUTING_Message { + IPA_EXT_TCAP_ROUTING_MsgType msg_type, + uint32_t seq_nr, + IPA_EXT_TCAP_ROUTING_MsgUnion u +} with { variant (u) "CROSSTAG(add_range, msg_type = IPA_EXT_TCAP_ROUTING_MSG_TID_ADD_RANGE; + ack, msg_type = IPA_EXT_TCAP_ROUTING_MSG_TID_ACK; + nack, msg_type = IPA_EXT_TCAP_ROUTING_MSG_TID_NACK)" +}; + +external function enc_IPA_EXT_TCAP_ROUTING_Message(in IPA_EXT_TCAP_ROUTING_Message pdu) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_IPA_EXT_TCAP_ROUTING_Message(in octetstring stream) return IPA_EXT_TCAP_ROUTING_Message + with { extension "prototype(convert) decode(RAW)" }; + +/* Generic template for matching messages by type and/or the BTS number */ +template (present) IPA_EXT_TCAP_ROUTING_Message +tr_IPA_EXT_TCAP_ROUTING_Message(template IPA_EXT_TCAP_ROUTING_MsgType msg_type := ?) := { + msg_type := msg_type, + seq_nr := ?, + u := ? +} + +template (value) IPA_EXT_TCAP_ROUTING_Message +ts_IPA_EXT_TCAP_ROUTING_ADD_RANGE(template (value) uint32_t seq_nr, + template (value) uint32_t tid_start, + template (value) uint32_t tid_end, + template (value) uint32_t pc, + template (value) uint8_t ssn) := { + msg_type := IPA_EXT_TCAP_ROUTING_MSG_TID_ADD_RANGE, + seq_nr := seq_nr, + u := { + add_range := { + tid_start := tid_start, + tid_end := tid_end, + pc := pc, + ssn := ssn + } + } +} + + +} with { encode "RAW" }; diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 2df598a..9105f41 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -60,6 +60,10 @@ import from PCUIF_Types all; #endif +#ifdef IPA_EMULATION_TCAP_ROUTING +import from IPA_EXT_TCAP_ROUTING all; +#endif + modulepar { /* Use Osmocom extended IPA mux header */ boolean mp_ipa_mgcp_uses_osmo_ext := true; @@ -202,6 +206,12 @@ } with { extension "internal" } #endif +#ifdef IPA_EMULATION_TCAP_ROUTING +/* Client port for Osmocom PCU extension inside IPA */ +type port IPA_TCAP_ROUTING_PT message { + inout IPA_EXT_TCAP_ROUTING_Message, ASP_IPA_Event; +} with { extension "internal" } +#endif type component IPA_Emulation_CT { @@ -242,6 +252,10 @@ /* up-facing port for RSPRO */ port IPA_OSMO_PCU_PT IPA_OSMO_PCU_PORT; #endif +#ifdef IPA_EMULATION_TCAP_ROUTING + /* up-facing port for RSPRO */ + port IPA_TCAP_ROUTING_PT IPA_TCAP_ROUTING_PORT; +#endif /* up-facing port for other streams */ port IPA_SP_PT IPA_SP_PORT; @@ -410,6 +424,11 @@ IPA_OSMO_PCU_PORT.send(evt); } #endif +#ifdef IPA_EMULATION_TCAP_ROUTING + if (IPA_TCAP_ROUTING_PORT.checkstate("Connected")) { + IPA_TCAP_ROUTING_PORT.send(evt); + } +#endif /* FIXME: to other ports */ } @@ -657,6 +676,13 @@ } #endif +#ifdef IPA_EMULATION_TCAP_ROUTING +private function f_tcap_routing_to_user(octetstring msg) runs on IPA_Emulation_CT { + var IPA_EXT_TCAP_ROUTING_Message pcuif_msg := dec_IPA_EXT_TCAP_ROUTING_Message(msg); + IPA_TCAP_ROUTING_PORT.send(pcuif_msg); +} +#endif + #ifdef IPA_EMULATION_MGCP private function f_mgcp_to_user(octetstring msg) runs on IPA_Emulation_CT { var charstring msg_ch := oct2char(msg); @@ -734,6 +760,9 @@ #ifdef IPA_EMULATION_OSMO_PCU var PCUIF_Message pcu; #endif +#ifdef IPA_EMULATION_TCAP_ROUTING + var IPA_EXT_TCAP_ROUTING_Message tcap_routing; +#endif /* Set function for dissecting the binary */ var f_IPL4_getMsgLen vl_f := refers(f_IPL4_fixedMsgLen); @@ -815,6 +844,11 @@ f_osmo_pcu_to_user(ipa_rx.msg); } #endif +#ifdef IPA_EMULATION_TCAP_ROUTING + case (IPAC_PROTO_EXT_TCAP_ROUTING) { + f_tcap_routing_to_user(ipa_rx.msg); + } +#endif case else { IPA_SP_PORT.send(f_to_asp(ipa_rx)); } @@ -916,6 +950,14 @@ } #endif +#ifdef IPA_EMULATION_TCAP_ROUTING + [] IPA_TCAP_ROUTING_PORT.receive(IPA_EXT_TCAP_ROUTING_Message:?) -> value tcap_routing { + payload := enc_IPA_EXT_TCAP_ROUTING_Message(tcap_routing); + ipa_ud := valueof(t_ASP_IPA_UD(IPAC_PROTO_OSMO, payload, IPAC_PROTO_EXT_TCAP_ROUTING)); + IPA_PORT.send(f_from_asp(f_ipa_conn_id(), ipa_ud)); + } +#endif + #ifdef IPA_EMULATION_RSL /* Received RSL -> down into IPA */ [] IPA_RSL_PORT.receive(ASP_RSL_Unitdata:?) -> value rsl { diff --git a/library/IPA_Types.ttcn b/library/IPA_Types.ttcn index fc729fb..4329f00 100644 --- a/library/IPA_Types.ttcn +++ b/library/IPA_Types.ttcn @@ -36,7 +36,8 @@ IPAC_PROTO_EXT_GSUP ('05'H), IPAC_PROTO_EXT_OAP ('06'H), IPAC_PROTO_EXT_RSPRO ('07'H), - IPAC_PROTO_EXT_OSMO_PCU ('08'H) + IPAC_PROTO_EXT_OSMO_PCU ('08'H), + IPAC_PROTO_EXT_TCAP_ROUTING ('09'H) } with { variant "FIELDLENGTH(8)" } external function enc_PDU_IPA(in PDU_IPA pdu) return octetstring -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibfcf633f7bd8773f557901fdff7580f5879391a1 Gerrit-Change-Number: 41135 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: WIP: stp: Introduce STP_Tests_TCAP
by pespin 19 Sep '25

19 Sep '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41136?usp=email ) Change subject: WIP: stp: Introduce STP_Tests_TCAP ...................................................................... WIP: stp: Introduce STP_Tests_TCAP The network topology and test infrastructure already allows testing TCAP forwarding at STP over IPA<->IPA, M3UA<->IPA and M3UA<->M3UA. TODO: * Currently f_asp_tx_tcap_full_transaction() is tweak to pass based on regular M3UA OPC+DPC+SLS loadsharing routing, see the functions f_asp*_any() being used instead of expecting Rx on a specific ASP. * There's some initial IPA extension TCAP_ROUTING in place and sending data properly to the STP, but it hasn't yet really been clarified how is that supposed to work at the STP... * Currently there's no route range setup for M3UA since it hasn't been clarified yet how is that supposed to work. Related: SYS#5423 Change-Id: I4340bdf126118c66af861f5a447e90883783920e --- M stp/STP_Tests_Common.ttcn A stp/STP_Tests_TCAP.cfg A stp/STP_Tests_TCAP.ttcn M stp/expected-results.xml M stp/gen_links.sh A stp/osmo-stp-tcap.confmerge M stp/regen_makefile.sh A stp/testenv_tcap.cfg 8 files changed, 744 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/41136/1 diff --git a/stp/STP_Tests_Common.ttcn b/stp/STP_Tests_Common.ttcn index 557fa29..0a0a436 100644 --- a/stp/STP_Tests_Common.ttcn +++ b/stp/STP_Tests_Common.ttcn @@ -13,6 +13,7 @@ friend module STP_Tests_M3UA; friend module STP_Tests_IPA; friend module STP_Tests_IPA_M3UA; +friend module STP_Tests_TCAP; import from General_Types all; import from Osmocom_Types all; diff --git a/stp/STP_Tests_TCAP.cfg b/stp/STP_Tests_TCAP.cfg new file mode 100644 index 0000000..4527377 --- /dev/null +++ b/stp/STP_Tests_TCAP.cfg @@ -0,0 +1,266 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./STP_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +STP_Tests_TCAP.mp_tcap_configs := { + # AS "as-m3ua-loadshare-0" + { + asp_name := "asp-m3ua-loadshare-0-0", + as_name := "as-m3ua-loadshare-0", + cfg := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 9900, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 23, + own_ssn := 8, /* MSC (MAP) */ + peer_pc := 5, + peer_ssn := 6, /* HLR (MAP) */ + sio := '83'O, + rctx := 1000 + } + }, + { + asp_name := "asp-m3ua-loadshare-0-1", + as_name := "as-m3ua-loadshare-0", + cfg := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 9901, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 23, + own_ssn := 8, /* MSC (MAP) */ + peer_pc := 5, + peer_ssn := 6, /* HLR (MAP) */ + sio := '83'O, + rctx := 1000 + } + }, + # AS "as-m3ua-loadshare-1" + { + asp_name := "asp-m3ua-loadshare-1-0", + as_name := "as-m3ua-loadshare-1", + cfg := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 9910, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 24, + own_ssn := 8, /* MSC (MAP) */ + peer_pc := 25, + peer_ssn := 6, /* HLR (MAP) */ + sio := '83'O, + rctx := 1001 + } + }, + { + asp_name := "asp-m3ua-loadshare-1-1", + as_name := "as-m3ua-loadshare-1", + cfg := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 9911, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 24, + own_ssn := 8, /* MSC (MAP) */ + peer_pc := 25, + peer_ssn := 6, /* HLR (MAP) */ + sio := '83'O, + rctx := 1001 + } + }, + # AS "as-m3ua-loadshare-2" + { + asp_name := "asp-m3ua-loadshare-2-0", + as_name := "as-m3ua-loadshare-2", + cfg := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 9920, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 25, + own_ssn := 8, /* MSC (MAP) */ + peer_pc := 24, + peer_ssn := 6, /* HLR (MAP) */ + sio := '83'O, + rctx := 1002 + } + }, + { + asp_name := "asp-m3ua-loadshare-2-1", + as_name := "as-m3ua-loadshare-2", + cfg := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 9921, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 25, + own_ssn := 8, /* MSC (MAP) */ + peer_pc := 24, + peer_ssn := 6, /* HLR (MAP) */ + sio := '83'O, + rctx := 1002 + } + }, + # AS "as-ipa-loadshare-0" + { + asp_name := "asp-ipa-loadshare-0-0", + as_name := "as-ipa-loadshare-0", + cfg := { + transport := SCCP_TRANSPORT_SCCPlite, + tpars := { + sccplite := { + tcp_addr := { 8800, "127.0.0.1", 5000, "127.0.0.1" }, + tcp_is_server := false, + ipa_ccm_pars := omit + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 5, + own_ssn := 6, /* HLR (MAP) */ + peer_pc := 23, + peer_ssn := 8, /* MSC (MAP) */ + sio := '83'O, + rctx := 0 + } + }, + { + asp_name := "asp-ipa-loadshare-0-1", + as_name := "as-ipa-loadshare-0", + cfg := { + transport := SCCP_TRANSPORT_SCCPlite, + tpars := { + sccplite := { + tcp_addr := { 8801, "127.0.0.1", 5000, "127.0.0.1" }, + tcp_is_server := false, + ipa_ccm_pars := omit + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 5, + own_ssn := 6, /* HLR (MAP) */ + peer_pc := 23, + peer_ssn := 8, /* MSC (MAP) */ + sio := '83'O, + rctx := 0 + } + }, + # AS "as-ipa-loadshare-1" + { + asp_name := "asp-ipa-loadshare-1-0", + as_name := "as-ipa-loadshare-1", + cfg := { + transport := SCCP_TRANSPORT_SCCPlite, + tpars := { + sccplite := { + tcp_addr := { 8810, "127.0.0.1", 5000, "127.0.0.1" }, + tcp_is_server := false, + ipa_ccm_pars := omit + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 6, + own_ssn := 6, /* HLR (MAP) */ + peer_pc := 7, + peer_ssn := 8, /* MSC (MAP) */ + sio := '83'O, + rctx := 0 + } + }, + { + asp_name := "asp-ipa-loadshare-1-1", + as_name := "as-ipa-loadshare-1", + cfg := { + transport := SCCP_TRANSPORT_SCCPlite, + tpars := { + sccplite := { + tcp_addr := { 8811, "127.0.0.1", 5000, "127.0.0.1" }, + tcp_is_server := false, + ipa_ccm_pars := omit + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 6, + own_ssn := 6, /* HLR (MAP) */ + peer_pc := 7, + peer_ssn := 8, /* MSC (MAP) */ + sio := '83'O, + rctx := 0 + } + }, + # AS "as-ipa-loadshare-2" + { + asp_name := "asp-ipa-loadshare-2-0", + as_name := "as-ipa-loadshare-2", + cfg := { + transport := SCCP_TRANSPORT_SCCPlite, + tpars := { + sccplite := { + tcp_addr := { 8820, "127.0.0.1", 5000, "127.0.0.1" }, + tcp_is_server := false, + ipa_ccm_pars := omit + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 7, + own_ssn := 6, /* HLR (MAP) */ + peer_pc := 6, + peer_ssn := 8, /* MSC (MAP) */ + sio := '83'O, + rctx := 0 + } + }, + { + asp_name := "asp-ipa-loadshare-2-1", + as_name := "as-ipa-loadshare-2", + cfg := { + transport := SCCP_TRANSPORT_SCCPlite, + tpars := { + sccplite := { + tcp_addr := { 8821, "127.0.0.1", 5000, "127.0.0.1" }, + tcp_is_server := false, + ipa_ccm_pars := omit + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 7, + own_ssn := 6, /* HLR (MAP) */ + peer_pc := 6, + peer_ssn := 8, /* MSC (MAP) */ + sio := '83'O, + rctx := 0 + } + } +} + +[MAIN_CONTROLLER] + +[EXECUTE] +STP_Tests_TCAP.control diff --git a/stp/STP_Tests_TCAP.ttcn b/stp/STP_Tests_TCAP.ttcn new file mode 100644 index 0000000..b38edba --- /dev/null +++ b/stp/STP_Tests_TCAP.ttcn @@ -0,0 +1,312 @@ +module STP_Tests_TCAP { + +/* Osmocom STP test suite in in TTCN-3, TCAP routing (TCAP: ITU Q.771-774) + * (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from IPL4asp_Types all; +import from Misc_Helpers all; + +import from Osmocom_VTY_Functions all; + +import from M3UA_Types all; +import from M3UA_Templates all; +import from M3UA_CodecPort all; +import from M3UA_CodecPort_CtrlFunct all; + +import from M3UA_Emulation all; +import from MTP3asp_Types all; +import from MTP3asp_PortType all; + +import from SCCP_Types all; +import from SCCP_Templates all; +import from SCCPasp_Types all; +import from SCCP_Emulation all; +import from SCCP_Adapter all; + +import from IPA_Emulation all; +import from IPA_EXT_TCAP_ROUTING all; + +import from STP_Tests_Common all; +import from STP_Tests_IPA all; +import from STP_Tests_M3UA all; + +import from TCAPMessages language "ASN.1:1997" all; +import from TCAP_Types all; +import from TCAP_Templates all; +import from TCAP_CodecPort all; + +import from STP_Tests_Common all; + +const integer MAX_NUM_ASP := 4; +const OCT1 c_M3UA_SI_SCCP := '03'O; + +type record TCAP_CT_Configuration { + /* Name of the ASP in the STP, (eg. to access it over VTY) */ + charstring asp_name, + /* Name of the AS in the STP, (eg. to access it over VTY) */ + charstring as_name, + SCCP_Adapter_Config cfg +} +type record of TCAP_CT_Configuration TCAP_CT_Configurations; + +modulepar { + /* local ASPs. Set in .cfg file: */ + TCAP_CT_Configurations mp_tcap_configs := {} +} + +type component TCAP_CT extends Test_CT { + var SCCP_Adapter g_tcap[MAX_NUM_ASP]; + port TCAP_CODEC_PT SCCP_TCAP[MAX_NUM_ASP]; + /* Port for IPA Extension TCAP_ROUTING */ + port IPA_TCAP_ROUTING_PT IPA_TCAP_ROUTING[MAX_NUM_ASP]; +}; + +private function tcap_build_configs(template (omit) Misc_Helpers.ro_charstring asps := omit) +runs on TCAP_CT return TCAP_CT_Configurations +{ + if (not isvalue(asps)) { + return mp_tcap_configs; + } + + var TCAP_CT_Configurations tcap_configs := {}; + for (var integer i := 0; i < lengthof(asps); i := i + 1) { + var boolean found := false; + for (var integer j := 0; j < lengthof(mp_tcap_configs); j := j + 1) { + if (mp_tcap_configs[j].asp_name == valueof(asps[i])) { + found := true; + tcap_configs := tcap_configs & {mp_tcap_configs[j]}; + break; + } + } + if (not found) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not find ASP ", asps[i], ", check your configuration")); + } + } + return tcap_configs; +} + + +private function f_init_tcap(TCAP_CT_Configurations tcap_configs) runs on TCAP_CT { + f_init_common(); + + for (var integer i := 0; i < lengthof(tcap_configs); i := i + 1) { + if (tcap_configs[i].cfg.transport == SCCP_TRANSPORT_SCCPlite) { + tcap_configs[i].cfg.tpars.sccplite.ipa_ccm_pars := c_IPA_default_ccm_pars; + tcap_configs[i].cfg.tpars.sccplite.ipa_ccm_pars.name := tcap_configs[i].as_name; + } + f_sccp_adapter_init(g_tcap[i], tcap_configs[i].cfg, "STP_TCAP_" & int2str(i)); + connect(self:SCCP_TCAP[i], g_tcap[i].vc_SCCP:SCCP_SP_PORT); + if (tcap_configs[i].cfg.transport == SCCP_TRANSPORT_SCCPlite) { + connect(self:IPA_TCAP_ROUTING[i], g_tcap[i].vc_IPA:IPA_TCAP_ROUTING_PORT); + } + } + + for (var integer i := 0; i < lengthof(tcap_configs); i := i + 1) { + f_sccp_adapter_start(g_tcap[i]); + } + + /* M3UA Emulation doesn't yet signal events up the stack, so it's + impossible to know exactly when the ASP becomes active. Hence, wait for + a while here to do ASPUP+ASPAC procedures: */ + f_sleep(3.0); +} + +private function f_asp_tx_ipa_ext_tcap_routing(template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg, integer asp_idx := 0) +runs on TCAP_CT +{ + IPA_TCAP_ROUTING[asp_idx].send(tcap_rt_msg); +} + +private function f_asp_tx_tcap(template (value) TCMessage tcap_msg, + integer asp_idx := 0) +runs on TCAP_CT +{ + var template (value) TCAP_N_UNITDATA_req sccp_unitdata_req := + ts_TCAP_UNITDATA_req(g_tcap[asp_idx].sccp_addr_peer, + g_tcap[asp_idx].sccp_addr_own, + tcap_msg) + SCCP_TCAP[asp_idx].send(sccp_unitdata_req); +} + + +private altstep as_asp_rx_tcap_any(template (present) TCMessage tcap_msg := ?, + integer tx_asp_idx := 0) +runs on TCAP_CT +{ + var template (present) TCAP_N_UNITDATA_ind exp_sccp_unitdata_ind := + tr_TCAP_UNITDATA_ind(g_tcap[tx_asp_idx].sccp_addr_peer, + g_tcap[tx_asp_idx].sccp_addr_own, + tcap_msg); + [] any from SCCP_TCAP.receive(exp_sccp_unitdata_ind) { + setverdict(pass); + } +} + +private altstep as_asp_rx_tcap(template (present) TCMessage tcap_msg := ?, + integer tx_asp_idx := 0, + integer rx_asp_idx := 0, boolean fail_rx_others := true) +runs on TCAP_CT +{ + var template (present) TCAP_N_UNITDATA_ind exp_sccp_unitdata_ind := + tr_TCAP_UNITDATA_ind(g_tcap[tx_asp_idx].sccp_addr_peer, + g_tcap[tx_asp_idx].sccp_addr_own, + tcap_msg); + + [] SCCP_TCAP[rx_asp_idx].receive(exp_sccp_unitdata_ind) { + setverdict(pass); + } + [fail_rx_others] any from SCCP_TCAP.receive(exp_sccp_unitdata_ind) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx TCAP at unexpected ASP with idx != ", rx_asp_idx)); + } +} + +private function f_asp_tx_tcap_exp(template (value) TCMessage tcap_msg, + integer tx_asp_idx, + integer rx_asp_idx) +runs on TCAP_CT +{ + f_asp_tx_tcap(tcap_msg, tx_asp_idx); + as_asp_rx_tcap(tcap_msg, tx_asp_idx, rx_asp_idx); +} + +private function f_asp_tx_tcap_exp_any(template (value) TCMessage tcap_msg, + integer tx_asp_idx) +runs on TCAP_CT +{ + f_asp_tx_tcap(tcap_msg, tx_asp_idx); + as_asp_rx_tcap_any(tcap_msg, tx_asp_idx); +} + +private function f_asp_tx_tcap_full_transaction(integer o_asp_idx, + integer t_asp_idx, + OCT4 o_tid, + OCT4 t_tid) +runs on TCAP_CT +{ + var template (value) TCMessage tcap_msg; + + /* TCAP Being: O -> T */ + tcap_msg := ts_TCAP_Begin(o_tid); + f_asp_tx_tcap_exp(tcap_msg, o_asp_idx, t_asp_idx); + + /* TCAP Continue: O <- T */ + tcap_msg := ts_TCAP_Continue(t_tid, o_tid); + // FIXME: enable this one instead when TCAP routing is implemented... + //f_asp_tx_tcap_exp(tcap_msg, t_asp_idx, o_asp_idx); + f_asp_tx_tcap_exp_any(tcap_msg, t_asp_idx); + + /* TCAP Continue: O -> T */ + tcap_msg := ts_TCAP_Continue(o_tid, t_tid); + f_asp_tx_tcap_exp(tcap_msg, o_asp_idx, t_asp_idx); + + /* TCAP End O <- T */ + tcap_msg := ts_TCAP_End(o_tid); + // FIXME: enable this one instead when TCAP routing is implemented... + //f_asp_tx_tcap_exp(tcap_msg, t_asp_idx, o_asp_idx); + f_asp_tx_tcap_exp_any(tcap_msg, t_asp_idx); +} + +/* test routing TCAP traffic from M3UA AS to M3UA AS */ +testcase TC_tcap_loadshare_m3ua_to_m3ua() runs on TCAP_CT { + var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-1-0", + "asp-m3ua-loadshare-1-1", + "asp-m3ua-loadshare-2-0", + "asp-m3ua-loadshare-2-1" }; + var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); + + f_init_tcap(tcap_configs); + + /* TODO: there is currently no way to configure TCAP routing on M3UA AS!!!! */ + + f_asp_tx_tcap_full_transaction(0, 3, int2oct(77, 4), int2oct(177, 4)); + + setverdict(pass); +} + +/* test routing TCAP traffic from IPA AS to M3UA AS */ +testcase TC_tcap_loadshare_ipa_to_ipa() runs on TCAP_CT { + var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; + var Misc_Helpers.ro_charstring tcap_asps := { "asp-ipa-loadshare-1-0", + "asp-ipa-loadshare-1-1", + "asp-ipa-loadshare-2-0", + "asp-ipa-loadshare-2-1" }; + var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); + + f_init_tcap(tcap_configs); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-1-0": */ + tcap_rt_msg := ts_IPA_EXT_TCAP_ROUTING_ADD_RANGE(seq_nr := 0, + tid_start := 0, + tid_end := 99, + pc := tcap_configs[2].cfg.own_pc, + ssn := tcap_configs[2].cfg.own_ssn); + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 0); + /* Configure TCAP routing on ASP "asp-ipa-loadshare-2-0": */ + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 2); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-1-1": */ + tcap_rt_msg.u.add_range.tid_start := 100; + tcap_rt_msg.u.add_range.tid_end := 199; + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 1); + /* Configure TCAP routing on ASP "asp-ipa-loadshare-2-1": */ + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 3); + + f_asp_tx_tcap_full_transaction(0, 3, int2oct(77, 4), int2oct(177, 4)); + + setverdict(pass); +} + +/* test routing TCAP traffic from IPA AS to M3UA AS */ +testcase TC_tcap_loadshare_m3ua_to_ipa() runs on TCAP_CT { + var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; + var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", + "asp-m3ua-loadshare-0-1", + "asp-ipa-loadshare-0-0", + "asp-ipa-loadshare-0-1" }; + var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); + + f_init_tcap(tcap_configs); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-0": */ + tcap_rt_msg := ts_IPA_EXT_TCAP_ROUTING_ADD_RANGE(seq_nr := 0, + tid_start := 0, + tid_end := 99, + pc := tcap_configs[2].cfg.own_pc, + ssn := tcap_configs[2].cfg.own_ssn); + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 2); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-1": */ + tcap_rt_msg.u.add_range.tid_start := 100; + tcap_rt_msg.u.add_range.tid_end := 199; + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 3); + + f_asp_tx_tcap_full_transaction(0, 3, int2oct(77, 4), int2oct(177, 4)); + + setverdict(pass); +} + +/* TODO: do some testing where TCAP Abort message is used. + * TODO: do some testing where only TCAP Begin+End message is used. + */ + +control { + execute( TC_tcap_loadshare_m3ua_to_m3ua() ); + execute( TC_tcap_loadshare_ipa_to_ipa() ); + execute( TC_tcap_loadshare_m3ua_to_ipa() ); +} + + + +} diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 91115d9..50d1379 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -68,4 +68,7 @@ <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_ni' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_patch_sccp' time='MASKED'/> + <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_m3ua_to_m3ua' time='MASKED'/> + <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_to_ipa' time='MASKED'/> + <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_m3ua_to_ipa' time='MASKED'/> </testsuite> diff --git a/stp/gen_links.sh b/stp/gen_links.sh index 625a3de..febef3d 100755 --- a/stp/gen_links.sh +++ b/stp/gen_links.sh @@ -46,11 +46,17 @@ FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" gen_links $DIR $FILES +DIR=../library/tcap +FILES="TCAPMessages.asn TCAP_DialoguePDUs.asn TCAP_UnidialoguePDUs.asn " +FILES+="TCAP_EncDec.cc TCAP_CodecPort.ttcn TCAP_Types.ttcn TCAP_Templates.ttcn " +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="IPA_EXT_TCAP_ROUTING.ttcn " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " -FILES+="SCCP_Templates.ttcn " +FILES+="SCCP_Templates.ttcn SCCP_Adapter.ttcnpp " FILES+="M3UA_Templates.ttcn M3UA_CodecPort.ttcn M3UA_CodecPort_CtrlFunct.ttcn M3UA_CodecPort_CtrlFunctDef.cc " FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES diff --git a/stp/osmo-stp-tcap.confmerge b/stp/osmo-stp-tcap.confmerge new file mode 100644 index 0000000..3b417ac --- /dev/null +++ b/stp/osmo-stp-tcap.confmerge @@ -0,0 +1,140 @@ +cs7 instance 0 + ! + !M3UA AS/ASP as(p)-m3ua-loadshare-0: + ! + asp asp-m3ua-loadshare-0-0 9900 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-m3ua-loadshare-0-1 9901 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + as as-m3ua-loadshare-0 m3ua + routing-key 1000 23 + asp asp-m3ua-loadshare-0-0 + asp asp-m3ua-loadshare-0-1 + ! + !M3UA AS/ASP as(p)-m3ua-loadshare-1: + ! + asp asp-m3ua-loadshare-1-0 9910 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-m3ua-loadshare-1-1 9911 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + as as-m3ua-loadshare-1 m3ua + routing-key 1001 24 + asp asp-m3ua-loadshare-1-0 + asp asp-m3ua-loadshare-1-1 + ! + !M3UA AS/ASP as(p)-m3ua-loadshare-2: + ! + asp asp-m3ua-loadshare-2-0 9920 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-m3ua-loadshare-2-1 9921 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + as as-m3ua-loadshare-2 m3ua + routing-key 1002 25 + asp asp-m3ua-loadshare-2-0 + asp asp-m3ua-loadshare-2-1 + ! + ! IPA AS as(p)-ipa-loadshare-0: + ! Hardcoded forward towards as-m3ua-loadshare-0 (PC=23) + ! + asp asp-ipa-loadshare-0-0 8800 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + transport-role server + asp asp-ipa-loadshare-0-1 8801 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + transport-role server + as as-ipa-loadshare-0 ipa + routing-key 0 5 + point-code override dpc 23 + asp asp-ipa-loadshare-0-0 + asp asp-ipa-loadshare-0-1 + ! + ! IPA AS as(p)-ipa-loadshare-1: + ! Hardcoded forward towards as-ipa-loadshare-2 (PC=7) + ! + asp asp-ipa-loadshare-1-0 8810 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + transport-role server + asp asp-ipa-loadshare-1-1 8811 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + transport-role server + as as-ipa-loadshare-1 ipa + routing-key 0 6 + point-code override dpc 7 + asp asp-ipa-loadshare-1-0 + asp asp-ipa-loadshare-1-1 + ! + ! IPA AS as(p)-ipa-loadshare-2: + ! Hardcoded forward towards as-ipa-loadshare-1 (PC=6) + ! + asp asp-ipa-loadshare-2-0 8820 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + transport-role server + asp asp-ipa-loadshare-2-1 8821 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + transport-role server + as as-ipa-loadshare-2 ipa + routing-key 0 7 + point-code override dpc 6 + asp asp-ipa-loadshare-2-0 + asp asp-ipa-loadshare-2-1 + ! + ! ROUTING TABLE: + ! + route-table system + update route 23 16777215 linkset as-m3ua-loadshare-0 + update route 24 16777215 linkset as-m3ua-loadshare-1 + update route 25 16777215 linkset as-m3ua-loadshare-2 + update route 5 16777215 linkset as-ipa-loadshare-0 + update route 6 16777215 linkset as-ipa-loadshare-1 + update route 7 16777215 linkset as-ipa-loadshare-2 + ! + !SERVERS: + ! + listen m3ua 2905 + local-ip 127.0.0.1 + local-ip ::1 + accept-asp-connections pre-configured + listen ipa 5000 + accept-asp-connections pre-configured diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh index 0d7fa48..2dab963 100755 --- a/stp/regen_makefile.sh +++ b/stp/regen_makefile.sh @@ -3,6 +3,7 @@ NAME=STP_Tests FILES=" + *.asn *.ttcn *.ttcnpp SCCP_EncDec.cc @@ -16,11 +17,13 @@ Native_FunctionDefs.cc TCCEncoding.cc M3UA_CodecPort_CtrlFunctDef.cc + TCAP_EncDec.cc " CPPFLAGS_TTCN3=" -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP + -DIPA_EMULATION_TCAP_ROUTING -DUSE_MTP3_DISTRIBUTOR " diff --git a/stp/testenv_tcap.cfg b/stp/testenv_tcap.cfg new file mode 100644 index 0000000..d9816e2 --- /dev/null +++ b/stp/testenv_tcap.cfg @@ -0,0 +1,12 @@ +[testsuite] +titan_min=11.1.0 +program=STP_Tests +config=STP_Tests_TCAP.cfg + +[stp] +prepare=osmo-config-merge osmo-stp.cfg osmo-stp-tcap.confmerge > osmo-stp-tcap.cfg +program=osmo-stp -c osmo-stp-tcap.cfg +make=libosmo-sigtran +package=osmo-stp libosmocore-utils +copy=osmo-stp.cfg osmo-stp-tcap.confmerge +vty_port=4239 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41136?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4340bdf126118c66af861f5a447e90883783920e Gerrit-Change-Number: 41136 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: Split SCCP_Adapter out of RAN_Adapter
by pespin 19 Sep '25

19 Sep '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41133?usp=email ) Change subject: Split SCCP_Adapter out of RAN_Adapter ...................................................................... Split SCCP_Adapter out of RAN_Adapter RAN_Adapter has further features and goes up in the stack, while sometimes getting an SCCP SAP is enough, eg. when doing stuf with SIGTRAN on the Core Network (eg. TCAP). TODO: Adapt cfg files of msc Change-Id: I0558d74d53ceb1b33c4f3d583f1b4489f6d7ee60 --- M bsc/BSC_Tests.default M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_ASCI.ttcn M bsc/BSC_Tests_SCCPlite.cfg M bsc/gen_links.sh M hnbgw/HNBGW_Tests.default M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M library/RAN_Adapter.ttcnpp A library/SCCP_Adapter.ttcnpp M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh M sgsn/SGSN_Tests.default M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn M sgsn/gen_links.sh 17 files changed, 548 insertions(+), 379 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/41133/1 diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default index 2c65b18..fe5ec86 100644 --- a/bsc/BSC_Tests.default +++ b/bsc/BSC_Tests.default @@ -41,39 +41,57 @@ BSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23905, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 185, # 0.23.1 first MSC emulation - own_ssn := 254, - peer_pc := 187, # 0.23.3 osmo-bsc - peer_ssn := 254, - sio := '83'O, - rctx := 1 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23905, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 185, # 0.23.1 first MSC emulation + own_ssn := 254, + peer_pc := 187, # 0.23.3 osmo-bsc + peer_ssn := 254, + sio := '83'O, + rctx := 1 + } }, { transport := BSSAP_TRANSPORT_AoIP, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 2, # 0.0.2 second MSC emulation - own_ssn := 254, - peer_pc := 187, # 0.23.3 osmo-bsc - peer_ssn := 254, - sio := '83'O, - rctx := 2 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 2, # 0.0.2 second MSC emulation + own_ssn := 254, + peer_pc := 187,# 0.23.3 osmo-bsc + peer_ssn := 254, + sio := '83'O, + rctx := 2 + } }, { transport := BSSAP_TRANSPORT_AoIP, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 3, # 0.0.3 third MSC emulation - own_ssn := 254, - peer_pc := 187, # 0.23.3 osmo-bsc - peer_ssn := 254, - sio := '83'O, - rctx := 3 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 3, # 0.0.3 third MSC emulation + own_ssn := 254, + peer_pc := 187, # 0.23.3 osmo-bsc + peer_ssn := 254, + sio := '83'O, + rctx := 3 + } } }; diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e6260b3..156c8ef 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -32,6 +32,7 @@ import from IPL4asp_Types all; import from BSSAP_Types all; +import from SCCP_Adapter all; import from RAN_Adapter all; import from BSSAP_LE_Adapter all; import from BSSAP_LE_CodecPort all; @@ -893,11 +894,11 @@ var BSSAP_N_UNITDATA_ind ud_ind; var boolean reset_received := false; timer T := 5.0; - BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own, + BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[bssap_idx].sccpa.sccp_addr_peer, g_bssap[bssap_idx].sccpa.sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); T.start; alt { - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[bssap_idx].sccp_addr_own, g_bssap[bssap_idx].sccp_addr_peer, + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[bssap_idx].sccpa.sccp_addr_own, g_bssap[bssap_idx].sccpa.sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!"); } @@ -1209,18 +1210,18 @@ var RanOps ranops := MSC_RanOps; ranops.use_osmux := g_osmux_enabled_cn; f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", ranops); - if (isbound(g_bssap[bssap_idx].vc_IPA)) { - connect(self:SCCPLITE_IPA_CFG_PORT[bssap_idx], g_bssap[bssap_idx].vc_IPA:CFG_PORT); + if (isbound(g_bssap[bssap_idx].sccpa.vc_IPA)) { + connect(self:SCCPLITE_IPA_CFG_PORT[bssap_idx], g_bssap[bssap_idx].sccpa.vc_IPA:CFG_PORT); } connect(self:SCCPLITE_IPA_CTRL, g_bssap[bssap_idx].vc_RAN:CTRL_CLIENT); f_ran_adapter_start(g_bssap[bssap_idx]); } else { - f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", omit); - if (isbound(g_bssap[bssap_idx].vc_IPA)) { - connect(self:SCCPLITE_IPA_CFG_PORT[bssap_idx], g_bssap[bssap_idx].vc_IPA:CFG_PORT); + f_sccp_adapter_init(g_bssap[bssap_idx].sccpa, mp_bssap_cfg[bssap_idx].sccp, "VirtMSC"); + if (isbound(g_bssap[bssap_idx].sccpa.vc_IPA)) { + connect(self:SCCPLITE_IPA_CFG_PORT[bssap_idx], g_bssap[bssap_idx].sccpa.vc_IPA:CFG_PORT); } - connect(self:BSSAP, g_bssap[bssap_idx].vc_SCCP:SCCP_SP_PORT); - f_ran_adapter_start(g_bssap[bssap_idx]); + connect(self:BSSAP, g_bssap[bssap_idx].sccpa.vc_SCCP:SCCP_SP_PORT); + f_sccp_adapter_start(g_bssap[bssap_idx].sccpa); f_legacy_bssap_reset(); } } @@ -1233,13 +1234,17 @@ os_error_text := omit }; - if (isbound(g_bssap[bssap_idx].vc_IPA)) { + if (isbound(g_bssap[bssap_idx].sccpa.vc_IPA)) { /* Alive components don't finish sockets (TCP FIN) when they are * stopped. Hence, we need to manually call close() on them to make sure * the IUT knows about it. */ f_ipa_cfg_disconnect(SCCPLITE_IPA_CFG_PORT[bssap_idx], res); } else { - f_ran_adapter_cleanup(g_bssap[bssap_idx]); + if (g_handler_mode) { + f_ran_adapter_cleanup(g_bssap[bssap_idx]); + } else { + f_sccp_adapter_cleanup(g_bssap[bssap_idx].sccpa); + } } } @@ -1696,7 +1701,7 @@ testcase TC_outbound_connect(integer bssap_idx := 0) runs on test_CT { f_init(1); - BSSAP.send(ts_BSSAP_CONNECT_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own, + BSSAP.send(ts_BSSAP_CONNECT_req(g_bssap[bssap_idx].sccpa.sccp_addr_peer, g_bssap[bssap_idx].sccpa.sccp_addr_own, 2342, ts_BSSMAP_AssignmentReq)); BSSAP.receive(tr_BSSAP_DISC_ind(2342, ?, ?)); f_shutdown_helper(); @@ -2416,9 +2421,9 @@ IPA_RSL[0][0].clear; /* perform BSSAP RESET, expect RESET ACK and DISC.ind on connection */ - BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); + BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); interleave { - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { } + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccpa.sccp_addr_own, g_bssap[0].sccpa.sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { } [] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { } } @@ -3510,7 +3515,7 @@ bssmap_chneed := omit; } - BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, + BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, ts_BSSMAP_Paging(imsi, cid_list, tmsi, bssmap_chneed))); if (not istemplatekind(tmsi, "omit")) { @@ -3828,9 +3833,9 @@ f_pageing_helper('001010123456789'H, cid_list, c_BtsId_all); /* Perform a BSSMAP Reset and wait for ACK */ - BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); + BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); alt { - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { } + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccpa.sccp_addr_own, g_bssap[0].sccpa.sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { } [] BSSAP.receive { repeat; } } @@ -3937,7 +3942,7 @@ for (i := 0; i < num_subscribers; i := i + 1) { /* Page on LAC-CI of BTS0: */ - BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, + BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, ts_BSSMAP_Paging(imsis[i], valueof(ts_BSSMAP_CIL_LAC_CI({ts_BSSMAP_CI_LAC_CI(1, 0)})), omit, omit))); } @@ -6679,8 +6684,8 @@ f_vty_encryption_a5(vty_a5_cfg); f_ctrs_bsc_and_bts_handover_init(); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_ho_into_this_bsc), pars); vc_conn.done; @@ -6853,8 +6858,8 @@ f_ctrs_bsc_and_bts_handover_init(); pars.last_used_eutran_plmn := '323454'O; - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_srvcc_eutran_to_geran_ho_out), pars); vc_conn.done; @@ -6960,8 +6965,8 @@ f_ctrs_bsc_and_bts_handover_init(); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears), pars); vc_conn.done; @@ -7057,8 +7062,8 @@ f_ctrs_bsc_and_bts_handover_init(); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears_after_ho_detect), pars); vc_conn.done; @@ -7149,8 +7154,8 @@ f_ctrs_bsc_and_bts_handover_init(); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect), pars); vc_conn.done; @@ -7233,8 +7238,8 @@ f_ctrs_bsc_and_bts_handover_init(); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect2), pars); vc_conn.done; @@ -9193,8 +9198,8 @@ var MSC_ConnHdlr vc_conn1; var TestHdlrParams pars1 := f_gen_test_hdlr_pars(bssap_idx := 0); pars1.mscpool.rsl_idx := 0; - pars1.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_peer; - pars1.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_own; + pars1.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccpa.sccp_addr_peer; + pars1.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccpa.sccp_addr_own; vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_imsi), pars1); vc_conn1.done; f_ctrs_msc_expect(0, "mscpool:subscr:paged"); @@ -9245,8 +9250,8 @@ var MSC_ConnHdlr vc_conn1; var TestHdlrParams pars1 := f_gen_test_hdlr_pars(bssap_idx := 0); pars1.mscpool.rsl_idx := 0; - pars1.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_peer; - pars1.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_own; + pars1.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccpa.sccp_addr_peer; + pars1.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccpa.sccp_addr_own; vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_tmsi), pars1); vc_conn1.done; f_ctrs_msc_expect(0, "mscpool:subscr:paged"); @@ -10555,8 +10560,8 @@ f_init(1, true); f_sleep(1.0); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_lcs_loc_req_for_idle_ms), pars); vc_conn.done; @@ -10595,8 +10600,8 @@ f_init(1, true); f_sleep(1.0); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_lcs_loc_req_no_subscriber), pars); vc_conn.done; @@ -10730,8 +10735,8 @@ f_init(1, true); f_sleep(1.0); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_lcs_loc_req_for_idle_ms_no_pag_resp), pars); vc_conn.done; @@ -10790,8 +10795,8 @@ f_init(1, true); f_sleep(1.0); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; vc_conn := f_start_handler(refers(f_tc_cm_service_during_lcs_loc_req), pars); vc_conn.done; diff --git a/bsc/BSC_Tests_ASCI.ttcn b/bsc/BSC_Tests_ASCI.ttcn index eb4a9dc..f9c546c 100644 --- a/bsc/BSC_Tests_ASCI.ttcn +++ b/bsc/BSC_Tests_ASCI.ttcn @@ -510,8 +510,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_setup_ok := true; @@ -528,8 +528,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_assign_ok := true; @@ -550,8 +550,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_assign_fail := true; @@ -572,8 +572,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_talker_req := true; @@ -594,8 +594,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; /* MSC sends acknowledge before link on BTS fail. */ pars.asci_test.vgcs_talker_fail := true; @@ -618,8 +618,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; /* MSC sends acknowledge after link on BTS fail. */ pars.asci_test.vgcs_talker_fail := true; @@ -642,8 +642,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; /* MSC sends acknowledge before BTS establishes the uplink. */ pars.asci_test.vgcs_talker_est := true; @@ -666,8 +666,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; /* MSC sends acknowledge after BTS established the uplink. */ pars.asci_test.vgcs_talker_est := true; @@ -690,8 +690,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_talker_rel := true; pars.asci_test.delay_bts := true; @@ -713,8 +713,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_talker_rel := true; pars.asci_test.delay_msc := true; @@ -736,8 +736,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_uplink_reject := true; @@ -758,8 +758,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_uplink_seized := true; @@ -780,8 +780,8 @@ f_init(1, true); - pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; - pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + pars.sccp_addr_msc := g_bssap[0].sccpa.sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccpa.sccp_addr_peer; pars.asci_test.vgcs_uplink_release := true; diff --git a/bsc/BSC_Tests_SCCPlite.cfg b/bsc/BSC_Tests_SCCPlite.cfg index c5f46c9..e4f4068 100644 --- a/bsc/BSC_Tests_SCCPlite.cfg +++ b/bsc/BSC_Tests_SCCPlite.cfg @@ -16,15 +16,22 @@ BSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_SCCPlite, - transport_is_server := true, - sccp_service_type := "mtp3_itu", - sctp_addr := { 5000, "127.0.0.1", 4000, "" }, - own_pc := 185, # 0.23.1 first MSC emulation - own_ssn := 254, - peer_pc := 187, # 0.23.3 osmo-bsc - peer_ssn := 254, - sio := '83'O, - rctx := 0 + sccp := { + transport := SCCP_TRANSPORT_SCCPlite, + tpars := { + sccplite := { + tcp_addr := { 5000, "127.0.0.1", 4000, "" }, + tcp_is_server := true + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 185, # 0.23.1 first MSC emulation + own_ssn := 254, + peer_pc := 187, # 0.23.3 osmo-bsc + peer_ssn := 254, + sio := '83'O, + rctx := 0 + } } }; BSC_Tests.mp_enable_lcs_tests := false; diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 7e31117..33c697c 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn SCCP_Adapter.ttcnpp RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " diff --git a/hnbgw/HNBGW_Tests.default b/hnbgw/HNBGW_Tests.default index f44ccc5..5cafb12 100644 --- a/hnbgw/HNBGW_Tests.default +++ b/hnbgw/HNBGW_Tests.default @@ -37,100 +37,148 @@ HNBGW_Tests.mp_cn_cfg := { { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23905, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 185, # 0.23.1 first MSC emulation - own_ssn := 142, - peer_pc := 189, # 0.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 1 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23905, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 185, # 0.23.1 first MSC emulation + own_ssn := 142, + peer_pc := 189, # 0.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 1 + } }, { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 2, # 0.0.2 second MSC emulation - own_ssn := 142, - peer_pc := 189, # 0.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 3 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 2, # 0.0.2 second MSC emulation + own_ssn := 142, + peer_pc := 189, # 0.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 3 + } }, { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23909, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 3, # 0.0.3 third MSC emulation - own_ssn := 142, - peer_pc := 189, # 0.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 5 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23909, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 3, # 0.0.3 third MSC emulation + own_ssn := 142, + peer_pc := 189, # 0.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 5 + } }, { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23911, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 4, # 0.0.4 fourth MSC emulation - own_ssn := 142, - peer_pc := 189, # 0.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 7 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23911, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 4, # 0.0.4 fourth MSC emulation + own_ssn := 142, + peer_pc := 189, # 0.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 7 + } }, # SGSNs (NUM_SGSN entries) { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 188, # 0.23.4 first SGSN emulation - own_ssn := 142, - peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 2 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 188, # 0.23.4 first SGSN emulation + own_ssn := 142, + peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 2 + } }, { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23908, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 10, # 0.1.2 second SGSN emulation - own_ssn := 142, - peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 4 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23908, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 10, # 0.1.2 second SGSN emulation + own_ssn := 142, + peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 4 + } }, { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23910, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 11, # 0.1.3 third SGSN emulation - own_ssn := 142, - peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 6 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23910, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 11, # 0.1.3 third SGSN emulation + own_ssn := 142, + peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 6 + } }, { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23912, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 12, # 0.1.4 fourth SGSN emulation - own_ssn := 142, - peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw - peer_ssn := 142, - sio := '83'O, - rctx := 8 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23912, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 12, # 0.1.4 fourth SGSN emulation + own_ssn := 142, + peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw + peer_ssn := 142, + sio := '83'O, + rctx := 8 + } } }; diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 2ef7b4d..f22713b 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -539,8 +539,8 @@ pfcp_pars := pfcp_pars, rab_rel_cause := rab_rel_cause, hnbgw_timer_x31 := mp_hnbgw_timer_x31); - pars.sccp_addr_hnbgw := g_cn[valueof(pars.cn_idx)].sccp_addr_peer; - pars.sccp_addr_msc := g_cn[valueof(pars.cn_idx)].sccp_addr_own; + pars.sccp_addr_hnbgw := g_cn[valueof(pars.cn_idx)].sccpa.sccp_addr_peer; + pars.sccp_addr_msc := g_cn[valueof(pars.cn_idx)].sccpa.sccp_addr_own; return valueof(pars); } diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index a6a2f54..c8ed46d 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -99,7 +99,7 @@ DIR=../library FILES="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn " FILES+="SDP_Templates.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " -FILES+="RAN_Adapter.ttcnpp RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn SCCP_Templates.ttcn " +FILES+="SCCP_Adapter.ttcnpp RAN_Adapter.ttcnpp RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn SCCP_Templates.ttcn " FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index d1cd85c..3334749 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -22,15 +22,12 @@ import from MTP3asp_Types all; import from MTP3asp_PortType all; -import from IPA_Emulation all; - import from SCCP_Types all; import from SCCPasp_Types all; import from SCCP_Emulation all; import from SCCP_Templates all; -import from SCTPasp_Types all; -import from SCTPasp_PortType all; +import from SCCP_Adapter all; #ifdef RAN_EMULATION_BSSAP import from BSSMAP_Templates all; @@ -38,178 +35,79 @@ import from RAN_Emulation all; type record RAN_Adapter { - /* component references */ - M3UA_CT vc_M3UA, /* only in 3GPP AoIP */ - IPA_Emulation_CT vc_IPA, /* only in SCCPlite */ - IPA_EventWaiter_CT vc_WAIT, /* only in SCCPlite */ - SCCP_CT vc_SCCP, - - MSC_SCCP_MTP3_parameters sccp_pars, - SCCP_PAR_Address sccp_addr_own, - SCCP_PAR_Address sccp_addr_peer, + SCCP_Adapter sccpa, RAN_Transport transport, - boolean transport_is_server, - - /* handler mode */ RAN_Emulation_CT vc_RAN } type record RAN_Configuration { RAN_Transport transport, - boolean transport_is_server, - charstring sccp_service_type, - SCTP_Association_Address sctp_addr, - integer own_pc, - integer own_ssn, - integer peer_pc, - integer peer_ssn, - octetstring sio, - integer rctx + SCCP_Adapter_Config sccp }; type record of RAN_Configuration RAN_Configurations; -private function init_pars(inout RAN_Adapter ba, in RAN_Configuration cfg) { - ba.sccp_pars := { - sio := { - ni := substr(oct2bit(cfg.sio),0,2), - prio := substr(oct2bit(cfg.sio),2,2), - si := substr(oct2bit(cfg.sio),4,4) - }, - opc := cfg.own_pc, - dpc := cfg.peer_pc, - sls := 0, - sccp_serviceType := cfg.sccp_service_type, - ssn := cfg.own_ssn - }; - ba.sccp_addr_own := valueof(ts_SccpAddr_PC_SSN(cfg.own_pc, cfg.own_ssn, cfg.sio, cfg.sccp_service_type)); - ba.sccp_addr_peer := valueof(ts_SccpAddr_PC_SSN(cfg.peer_pc, cfg.peer_ssn, cfg.sio, cfg.sccp_service_type)); - ba.transport := cfg.transport; - ba.transport_is_server := cfg.transport_is_server; -} - - function f_ran_adapter_init(inout RAN_Adapter ba, in RAN_Configuration cfg, charstring id, - template RanOps ops) { - init_pars(ba, cfg); - ops.sccp_addr_local := ba.sccp_addr_own; - ops.sccp_addr_peer := ba.sccp_addr_peer; + RanOps ops) { + f_sccp_adapter_init(ba.sccpa, cfg.sccp, id); + ba.transport := cfg.transport; + ops.sccp_addr_local := ba.sccpa.sccp_addr_own; + ops.sccp_addr_peer := ba.sccpa.sccp_addr_peer; /* create components */ - ba.vc_SCCP := SCCP_CT.create(id & "-SCCP") alive; - if (isvalue(ops)) { - ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN") alive; - } else { - ba.vc_RAN := null; - } - select (cfg.transport) { - case (BSSAP_TRANSPORT_AoIP, RANAP_TRANSPORT_IuCS) { - var template (omit) integer rctx; - if (not ispresent(cfg.rctx)) { - rctx := omit; - } else { - rctx := cfg.rctx; - } - ba.vc_M3UA := M3UA_CT.create(id & "-M3UA") alive; - map(ba.vc_M3UA:SCTP_PORT, system:sctp); - /* connect MTP3 service provider (M3UA) to lower side of SCCP */ - connect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); - ba.vc_M3UA.start(f_M3UA_Emulation(cfg.sctp_addr, rctx)); - } -#ifdef IPA_EMULATION_SCCP - case (SCCP_TRANSPORT_SCCPlite) { - ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA") alive; - map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); - /* connect MTP3 service provider (IPA) to lower side of SCCP */ - connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); - /* connect waiter to general IPA port (for ASP_IPA_Event) */ - ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive; - connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); - ba.vc_WAIT.start(IPA_Emulation.waiter_main()); - if (cfg.transport_is_server) { - ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr, - cfg.sctp_addr.local_sctp_port, - true, IPA_INIT_SEND_IPA_ID_ACK)); - } else { - ba.vc_IPA.start(IPA_Emulation.main_client(cfg.sctp_addr.remote_ip_addr, - cfg.sctp_addr.remote_sctp_port, - cfg.sctp_addr.local_ip_addr, - cfg.sctp_addr.local_sctp_port, - ba.ipa_ccm_pars)); - } - /* wait until we received an IPA CCM ID_ACK */ - ba.vc_WAIT.done; - disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); - } -#endif /* IPA_EMULATION_SCCP */ - case else { - setverdict(fail, "Unsuppored RAN_Transport"); - mtc.stop; - } - } + ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN") alive; - if (isvalue(ops)) { - 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) { + 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 - log("Connecting RANAP RAN_Emulation to SCCP_SP_PORT"); - ops.protocol := RAN_PROTOCOL_RANAP - connect(ba.vc_RAN:RANAP, ba.vc_SCCP:SCCP_SP_PORT); + log("Connecting RANAP RAN_Emulation to SCCP_SP_PORT"); + ops.protocol := RAN_PROTOCOL_RANAP + connect(ba.vc_RAN:RANAP, ba.sccpa.vc_SCCP:SCCP_SP_PORT); #endif - } else { + } else { #ifdef RAN_EMULATION_BSSAP - log("Connecting BSSAP RAN_Emulation to SCCP_SP_PORT"); - connect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); + log("Connecting BSSAP RAN_Emulation to SCCP_SP_PORT"); + connect(ba.vc_RAN:BSSAP, ba.sccpa.vc_SCCP:SCCP_SP_PORT); #endif - } - if (cfg.transport == BSSAP_TRANSPORT_SCCPlite) { + } + if (cfg.transport == BSSAP_TRANSPORT_SCCPlite) { #ifdef IPA_EMULATION_MGCP - /* connect IPA MGCP port with BSSMAP MGCP port */ - log("Connecting MGCP RAN Emulation to IPA MGCP PORT"); - connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP); + /* connect IPA MGCP port with BSSMAP MGCP port */ + log("Connecting MGCP RAN Emulation to IPA MGCP PORT"); + connect(ba.sccpa.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP); #endif #ifdef IPA_EMULATION_CTRL #ifdef RAN_EMULATION_CTRL - /* connect IPA CTRL port with BSSMAP CTRL port */ - log("Connecting CTRL RAN Emulation to IPA CTRL PORT"); - connect(ba.vc_IPA:IPA_CTRL_PORT, ba.vc_RAN:CTRL); + /* connect IPA CTRL port with BSSMAP CTRL port */ + log("Connecting CTRL RAN Emulation to IPA CTRL PORT"); + connect(ba.sccpa.vc_IPA:IPA_CTRL_PORT, ba.vc_RAN:CTRL); #endif #endif - } - log("Starting RAN_Emulation"); - ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), "")); } - - + log("Starting RAN_Emulation"); + ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), "")); } function f_ran_adapter_start(inout RAN_Adapter ba) { - ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); + f_sccp_adapter_start(ba.sccpa); } function f_ran_adapter_cleanup(inout RAN_Adapter ba) { - if (ba.vc_RAN != null) { - if (ba.transport == RANAP_TRANSPORT_IuCS) { + if (ba.transport == RANAP_TRANSPORT_IuCS) { #ifdef RAN_EMULATION_RANAP - disconnect(ba.vc_RAN:RANAP, ba.vc_SCCP:SCCP_SP_PORT); + disconnect(ba.vc_RAN:RANAP, ba.sccpa.vc_SCCP:SCCP_SP_PORT); #endif - } else { + } else { #ifdef RAN_EMULATION_BSSAP - disconnect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); + disconnect(ba.vc_RAN:BSSAP, ba.sccpa.vc_SCCP:SCCP_SP_PORT); #endif - } - ba.vc_RAN.stop; } - if (ba.transport == BSSAP_TRANSPORT_AoIP or - ba.transport == RANAP_TRANSPORT_IuCS) { - unmap(ba.vc_M3UA:SCTP_PORT, system:sctp); - disconnect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); - ba.vc_M3UA.stop; - } - ba.vc_SCCP.stop; + ba.vc_RAN.stop; + + f_sccp_adapter_cleanup(ba.sccpa); } diff --git a/library/SCCP_Adapter.ttcnpp b/library/SCCP_Adapter.ttcnpp new file mode 100644 index 0000000..6945255 --- /dev/null +++ b/library/SCCP_Adapter.ttcnpp @@ -0,0 +1,168 @@ +module SCCP_Adapter { + +/* This module implements a 'dumb' SCCP adapter. It creates the IPA/M3UA and SCCP components and allows stacking a + * codec port on top. As a result, it provides the ability to transceive SCCP-User-SAP primitives + * with decoded uper layer payload. Use this if you want to have full control about what you transmit or + * receive, without any automatisms in place. Allows you to refuse connections or other abnormal behavior. + */ +/* (C) 2017-2019 Harald Welte <laforge(a)gnumonks.org> + * (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; + +import from M3UA_Emulation all; +import from MTP3asp_Types all; +import from MTP3asp_PortType all; + +import from IPA_Emulation all; + +import from SCCP_Types all; +import from SCCPasp_Types all; +import from SCCP_Emulation all; +import from SCCP_Templates all; + +import from SCTPasp_Types all; +import from SCTPasp_PortType all; + +type enumerated SCCP_Adapter_Transport { + SCCP_TRANSPORT_SIGTRAN, /* 3GPP AoIP: SCCP over M3UA over SCTP */ + SCCP_TRANSPORT_SCCPlite /* SCCPlite: SCCP over IPA over TCP */ +}; + +type record SCCP_Adapter_Config_Sigtran { + SCTP_Association_Address sctp_addr + /* sctp_is_server: Controlled over module param M3UA_Emulation.tsp_SCTP_Server_Mode */ +}; + +type record SCCP_Adapter_Config_Sccplite { + SCTP_Association_Address tcp_addr, + boolean tcp_is_server +}; + +type union SCCP_Adapter_Transport_ConfigUnion { + SCCP_Adapter_Config_Sigtran sigtran, + SCCP_Adapter_Config_Sccplite sccplite +}; + +type record SCCP_Adapter_Config { + SCCP_Adapter_Transport transport, + SCCP_Adapter_Transport_ConfigUnion tpars, + charstring sccp_service_type, + integer own_pc, + integer own_ssn, + integer peer_pc, + integer peer_ssn, + octetstring sio, + integer rctx +} with { variant (tpars) "CROSSTAG(sigtran, transport = SCCP_TRANSPORT_SIGTRAN; + sccplite, transport = SCCP_TRANSPORT_SCCPlite;)" +}; +type record of SCCP_Adapter_Config SCCP_Adapter_Configs; + +type record SCCP_Adapter { + /* component references */ + M3UA_CT vc_M3UA, /* only in 3GPP AoIP */ + IPA_Emulation_CT vc_IPA, /* only in SCCPlite */ + IPA_EventWaiter_CT vc_WAIT, /* only in SCCPlite */ + SCCP_CT vc_SCCP, + + MSC_SCCP_MTP3_parameters sccp_pars, + SCCP_PAR_Address sccp_addr_own, + SCCP_PAR_Address sccp_addr_peer, + SCCP_Adapter_Config cfg +}; + + +private function init_pars(inout SCCP_Adapter ba, in SCCP_Adapter_Config cfg) { + ba.sccp_pars := { + sio := { + ni := substr(oct2bit(cfg.sio),0,2), + prio := substr(oct2bit(cfg.sio),2,2), + si := substr(oct2bit(cfg.sio),4,4) + }, + opc := cfg.own_pc, + dpc := cfg.peer_pc, + sls := 0, + sccp_serviceType := cfg.sccp_service_type, + ssn := cfg.own_ssn + }; + ba.sccp_addr_own := valueof(ts_SccpAddr_PC_SSN(cfg.own_pc, cfg.own_ssn, cfg.sio, cfg.sccp_service_type)); + ba.sccp_addr_peer := valueof(ts_SccpAddr_PC_SSN(cfg.peer_pc, cfg.peer_ssn, cfg.sio, cfg.sccp_service_type)); + ba.cfg := cfg; +} + +function f_sccp_adapter_init(inout SCCP_Adapter ba, in SCCP_Adapter_Config cfg, charstring id) { + init_pars(ba, cfg); + + /* create components */ + ba.vc_SCCP := SCCP_CT.create(id & "-SCCP") alive; + select (cfg.transport) { + case (SCCP_TRANSPORT_SIGTRAN) { + var template (omit) integer rctx; + if (not ispresent(cfg.rctx)) { + rctx := omit; + } else { + rctx := cfg.rctx; + } + ba.vc_M3UA := M3UA_CT.create(id & "-M3UA") alive; + map(ba.vc_M3UA:SCTP_PORT, system:sctp); + /* connect MTP3 service provider (M3UA) to lower side of SCCP */ + connect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + ba.vc_M3UA.start(f_M3UA_Emulation(cfg.tpars.sigtran.sctp_addr, rctx)); + } +#ifdef IPA_EMULATION_SCCP + case (SCCP_TRANSPORT_SCCPlite) { + ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA") alive; + map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); + /* connect MTP3 service provider (IPA) to lower side of SCCP */ + connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + /* connect waiter to general IPA port (for ASP_IPA_Event) */ + ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive; + connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + ba.vc_WAIT.start(IPA_Emulation.waiter_main()); + if (cfg.tpars.sccplite.tcp_is_server) { + ba.vc_IPA.start(IPA_Emulation.main_server(cfg.tpars.sccplite.tcp_addr.local_ip_addr, + cfg.tpars.sccplite.tcp_addr.local_sctp_port, + true, IPA_INIT_SEND_IPA_ID_ACK)); + } else { + ba.vc_IPA.start(IPA_Emulation.main_client(cfg.tpars.sccplite.tcp_addr.remote_ip_addr, + cfg.tpars.sccplite.tcp_addr.remote_sctp_port, + cfg.tpars.sccplite.tcp_addr.local_ip_addr, + cfg.tpars.sccplite.tcp_addr.local_sctp_port)); + } + /* wait until we received an IPA CCM ID_ACK */ + ba.vc_WAIT.done; + disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + } +#endif /* IPA_EMULATION_SCCP */ + case else { + setverdict(fail, "Unsuppored RAN_Transport"); + mtc.stop; + } + } + + +} + +function f_sccp_adapter_start(inout SCCP_Adapter ba) { + ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); +} + +function f_sccp_adapter_cleanup(inout SCCP_Adapter ba) { + if (ba.cfg.transport == SCCP_TRANSPORT_SIGTRAN) { + unmap(ba.vc_M3UA:SCTP_PORT, system:sctp); + disconnect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + ba.vc_M3UA.stop; + } + ba.vc_SCCP.stop; +} + +} with { encode "RAW" }; diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default index a89101b..61fa94c 100644 --- a/msc/MSC_Tests.default +++ b/msc/MSC_Tests.default @@ -47,39 +47,57 @@ MSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 193, - own_ssn := 254, - peer_pc := 185, - peer_ssn := 254, - sio := '83'O, - rctx := 0 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23906, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 193, + own_ssn := 254, + peer_pc := 185, + peer_ssn := 254, + sio := '83'O, + rctx := 0 + } }, { transport := BSSAP_TRANSPORT_AoIP, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 194, - own_ssn := 254, - peer_pc := 185, - peer_ssn := 254, - sio := '83'O, - rctx := 1 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23907, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 194, + own_ssn := 254, + peer_pc := 185, + peer_ssn := 254, + sio := '83'O, + rctx := 1 + } }, { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23908, "127.0.0.1", 2905, "127.0.0.1" }, - own_pc := 195, - own_ssn := 142, - peer_pc := 185, - peer_ssn := 142, - sio := '83'O, - rctx := 2 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23908, "127.0.0.1", 2905, "127.0.0.1" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 195, + own_ssn := 142, + peer_pc := 185, + peer_ssn := 142, + sio := '83'O, + rctx := 2 + } } }; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 12c6561..1c08a5d 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -29,6 +29,7 @@ import from SCCPasp_Types all; import from SCCP_Types all; import from SCCP_Emulation all; +import from SCCP_Adapter all; import from SCTPasp_Types all; import from SCTPasp_PortType all; @@ -395,8 +396,8 @@ * to f_init() when the high level functions of the BSC_ConnectionHandler are * not needed. */ function f_init_bssap_direct() runs on MTC_CT { - f_ran_adapter_init(g_bssap[0], mp_bssap_cfg[0], "MSC_Test", omit); - connect(g_bssap[0].vc_SCCP:SCCP_SP_PORT, self:BSSAP_DIRECT); + f_sccp_adapter_init(g_bssap[0].sccpa, mp_bssap_cfg[0].sccp, "MSC_Test"); + connect(g_bssap[0].sccpa.vc_SCCP:SCCP_SP_PORT, self:BSSAP_DIRECT); /* Start guard timer and activate it as default */ Tguard_direct.start @@ -425,8 +426,8 @@ check_imei_error := false }; var BSC_ConnHdlrPars pars := { - sccp_addr_own := g_bssap[ran_idx].sccp_addr_own, - sccp_addr_peer := g_bssap[ran_idx].sccp_addr_peer, + sccp_addr_own := g_bssap[ran_idx].sccpa.sccp_addr_own, + sccp_addr_peer := g_bssap[ran_idx].sccpa.sccp_addr_peer, cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)), imei := f_gen_imei(imsi_suffix), imsi := f_gen_imsi(imsi_suffix), @@ -2308,15 +2309,15 @@ var boolean reset_ack_seen := false; f_init_bssap_direct(); - f_ran_adapter_start(g_bssap[0]); + f_sccp_adapter_start(g_bssap[0].sccpa); f_sleep(3.0); /* Make a blind connection attemt, to trigger the deadlock condition */ - BSSAP_DIRECT.send(ts_BSSAP_CONNECT_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, 1, omit)); + BSSAP_DIRECT.send(ts_BSSAP_CONNECT_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, 1, omit)); /* Send a BSSMAP reset */ - BSSAP_DIRECT.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0))); + BSSAP_DIRECT.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, ts_BSSMAP_Reset(0))); T.start alt { [] BSSAP_DIRECT.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_ResetAck)) { @@ -2326,7 +2327,7 @@ /* Acknowledge MSC sided reset requests */ [] BSSAP_DIRECT.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset)) { - BSSAP_DIRECT.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_ResetAck)); + BSSAP_DIRECT.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, ts_BSSMAP_ResetAck)); repeat; } diff --git a/msc/gen_links.sh b/msc/gen_links.sh index f18c2f8..6a9903d 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -96,7 +96,7 @@ FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn L3_Common.ttcn " -FILES+="RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn RAN_Adapter.ttcnpp SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " +FILES+="RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn SCCP_Adapter.ttcnpp RAN_Adapter.ttcnpp SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index b31d86c..330dc1b 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -42,15 +42,21 @@ SGSN_Tests.mp_ranap_cfg := { { transport := RANAP_TRANSPORT_IuCS, - transport_is_server := false, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23908, "127.0.0.104", 2905, "127.0.0.200" }, - own_pc := 195, - own_ssn := 142, - peer_pc := 188, # 0.23.4 - peer_ssn := 142, - sio := '83'O, - rctx := 2 + sccp := { + transport := SCCP_TRANSPORT_SIGTRAN, + tpars := { + sigtran := { + sctp_addr := { 23908, "127.0.0.104", 2905, "127.0.0.200" } + } + }, + sccp_service_type := "mtp3_itu", + own_pc := 195, + own_ssn := 142, + peer_pc := 188, # 0.23.4 + peer_ssn := 142, + sio := '83'O, + rctx := 2 + } } }; diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index ab818d0..a94eb3a 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -282,7 +282,7 @@ id := id & "-RNC_GTP"; var Gtp1uEmulationCfg gtp_cfg := { - gtpu_bind_ip := mp_ranap_cfg[rnc_idx].sctp_addr.local_ip_addr, + gtpu_bind_ip := mp_ranap_cfg[rnc_idx].sccp.tpars.sigtran.sctp_addr.local_ip_addr, gtpu_bind_port := GTP1U_PORT, use_gtpu_daemon := false }; @@ -507,8 +507,8 @@ runs on test_CT return BSSGP_ConnHdlr { var BSSGP_ConnHdlr vc_conn; if (g_iu_enable) { - pars.sccp_addr_local := g_iu[0].ranap.sccp_addr_own; - pars.sccp_addr_peer := g_iu[0].ranap.sccp_addr_peer; + pars.sccp_addr_local := g_iu[0].ranap.sccpa.sccp_addr_own; + pars.sccp_addr_peer := g_iu[0].ranap.sccpa.sccp_addr_peer; pars.grnc_id := g_iu[0].grnc_id; } diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 71c20ef..78215bb 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -43,7 +43,7 @@ } private function f_TC_iu_attach(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -89,7 +89,7 @@ } private function f_TC_iu_attach_geran_rau(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -115,7 +115,7 @@ } private function f_TC_geran_attach_iu_rau(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 0); @@ -138,7 +138,7 @@ } private function f_TC_attach_pdp_act_user(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -210,7 +210,7 @@ * deactivate the already created PDP context against GGSN. */ private function f_TC_attach_pdp_act_user_addr_itu_x213_ipv4lentoolarge(charstring id) runs on BSSGP_ConnHdlr { var integer ran_index := 3; - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); timer T := 5.0; apars.exp_rej_cause:= '26'O; /* Network failure */ @@ -248,7 +248,7 @@ /* Test UE going to PMM IDLE state after having activated the PDP context. * SGSN is expected to update the GGSN cancelling the Direct Tunnel feature. */ private function f_TC_attach_pdp_act_pmm_idle(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -284,7 +284,7 @@ /* TODO: same as TC_attach_pdp_act_pmm_idle, but with pdp_status=0000, meaning UE lost status about previous PDP Ctx. * We should see SGSN doing DeletePDPCtxReq towards GGSN instead of UdatePDPCtxReq, then probably re-create it. */ private function f_TC_attach_pdp_act_pmm_idle_lost_pdp_status(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -320,7 +320,7 @@ /* Test UE going to PMM IDLE state after having activated the PDP context. * SGSN is expected to update the GGSN cancelling the Direct Tunnel feature. */ private function f_TC_pmm_idle_rx_mt_data(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -367,7 +367,7 @@ of the RAB to make sure PDP context is established, since it may be that RNC got restarted. */ private function f_TC_update_ctx_err_ind_from_ggsn(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sccp.tpars.sigtran.sctp_addr.local_ip_addr)); var integer ran_index := 3; /* first perform regular attach */ diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index e991fd5..338b9f5 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -91,7 +91,7 @@ FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " FILES+="ITU_X213_Types.ttcn " -FILES+="RAN_Emulation.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " +FILES+="RAN_Emulation.ttcnpp SCCP_Adapter.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41133?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0558d74d53ceb1b33c4f3d583f1b4489f6d7ee60 Gerrit-Change-Number: 41133 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-msc[master]: vlr: Stop silent call before deduping subscribers
by matanp 19 Sep '25

19 Sep '25

Attention is currently required from: fixeria, lynxis lazus, neels. matanp has posted comments on this change by matanp. ( https://gerrit.osmocom.org/c/osmo-msc/+/41131?usp=email ) Change subject: vlr: Stop silent call before deduping subscribers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > It feels architecturally wrong to get the VLR involved in the MSC specific procedures, like the sile […] While I totally agree it feels wrong, it's worth saying that the current implementation calls paging_request_join_vsub, which comes from the MSC too. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41131?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If23f8b0e42d4a3a8bf1c8f5ca81b045834b6cccd Gerrit-Change-Number: 41131 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 18 Sep 2025 15:19:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: matanp <matan1008(a)gmail.com>

1 0

[XS] Change in osmo-msc[master]: vlr: Stop silent call before deduping subscribers
by fixeria 18 Sep '25

18 Sep '25

Attention is currently required from: lynxis lazus, matanp, neels. fixeria has posted comments on this change by matanp. ( https://gerrit.osmocom.org/c/osmo-msc/+/41131?usp=email ) Change subject: vlr: Stop silent call before deduping subscribers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I tried to solve the problem more elegantly, but making the VLR aware to the concept of silent calls […] It feels architecturally wrong to get the VLR involved in the MSC specific procedures, like the silent call. Moreover, the VLR code is also going to be used by osmo-sgsn at some point, and changes like this one will likely make the integration harder. I am not against merging this fix as a workaround, but ideally we should look for a more fundamental approach. Neels: Maybe you have any ideas? P.S. Would be nice to have a bug reproducer in TTCN-3 and/or in form of a unit test. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41131?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If23f8b0e42d4a3a8bf1c8f5ca81b045834b6cccd Gerrit-Change-Number: 41131 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Thu, 18 Sep 2025 12:47:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: matanp <matan1008(a)gmail.com>

1 0

2026

2025

2024

2023

2022

gerrit-log