June 2024 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: use signature dummys with correct length

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37215?usp=email ) Change subject: SGP32Definitions_Templates: use signature dummys with correct length ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieea99bab5c926420ce864d7c5067e55b2861b045 Gerrit-Change-Number: 37215 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jun 2024 14:50:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: use signature dummys with correct length

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37215?usp=email ) Change subject: SGP32Definitions_Templates: use signature dummys with correct length ...................................................................... SGP32Definitions_Templates: use signature dummys with correct length The dummy signature values we are currently using do not have the correct length. The ECDSA signatures used in SGP.32 have a well specified lengt of 64 bytes and they consist of two 32 bit integer nummbers called "R" and "S", so let's use signature dummys with the correct length and recognizeable values. Related: SYS#6824 Change-Id: Ieea99bab5c926420ce864d7c5067e55b2861b045 --- M library/euicc/SGP32Definitions_Templates.ttcn 1 file changed, 52 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/37215/1 diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index 98846c5..218f3ed 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -45,7 +45,8 @@ initiateAuthenticationOkEsipa := { transactionId := omit, serverSigned1 := ts_serverSigned1(euiccChallenge := euiccChallenge, serverAddress := serverAddress), - serverSignature1 := '01020304'O, + serverSignature1 := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O, euiccCiPKIdToBeUsed := 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O, /* NIST */ serverCertificate := ts_cert_s_sm_dpauth_nist, // serverCertificate := ts_cert_s_sm_dpauth_brp, @@ -94,7 +95,8 @@ authenticateServerResponse := { authenticateResponseOk := { euiccSigned1 := ts_euiccSigned1, - euiccSignature1 := '1234567890'O, + euiccSignature1 := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O, euiccCertificate := ts_cert_eum_nist, eumCertificate := ts_cert_s_sm_dpauth_nist } @@ -163,7 +165,8 @@ ccRequiredFlag := false, bppEuiccOtpk := omit }, - smdpSignature2 := 'AAAAAAAAAAAAAAAAAAAAAAAA'O, + smdpSignature2 := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O, smdpCertificate := ts_cert_s_sm_dpauth_nist, // smdpCertificate := ts_cert_s_sm_dpauth_brp, // smdpCertificate := ts_cert_s_sm_dp2auth_nist, @@ -502,7 +505,8 @@ transactionId := omit, euiccPackage := euiccPackage }, - eimSignature := '1234567890'O + eimSignature := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } } @@ -613,7 +617,8 @@ } } }, - euiccSignEPR := 'AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } @@ -635,7 +640,8 @@ pendingNotification := { profileInstallationResult := { profileInstallationResultData := ts_profileInstallationResultData, - euiccSignPIR := '00112233445566778899AABBCCDDEEFF'O + euiccSignPIR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } } @@ -673,7 +679,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -707,7 +714,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -741,7 +749,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -781,7 +790,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -834,7 +844,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -880,7 +891,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -914,7 +926,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -950,7 +963,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -984,7 +998,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -1018,7 +1033,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EuiccPackageResult @@ -1059,7 +1075,8 @@ } } }, - euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O } } template (present) EsipaMessageFromIpaToEim @@ -1195,7 +1212,9 @@ } } }, - euiccSignEPR := 'AABBCCDDEEFF'O + euiccSignEPR := '5252525252525252525252525252525252525252525252525252525252525252 + 5353535353535353535353535353535353535353535353535353535353535353'O + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieea99bab5c926420ce864d7c5067e55b2861b045 Gerrit-Change-Number: 37215 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: start the guard timer (20.0s by default)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37195?usp=email ) Change subject: s1gw: start the guard timer (20.0s by default) ...................................................................... s1gw: start the guard timer (20.0s by default) Change-Id: I0661a892908bd7b0c06ab5d03d2e28a7f646bc3d Related: SYS#6772 --- M s1gw/S1GW_Tests.ttcn 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index ad42a59..55d302e 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -43,9 +43,16 @@ }; type component test_CT { + timer g_Tguard; var S1AP_Server_CT vc_S1APSRV; }; +private altstep as_Tguard() runs on test_CT { + [] g_Tguard.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); + } +} + template Global_ENB_ID ts_Global_ENB_ID(integer enb_id := 0, OCT3 plmn_id := '00f110'O) := { @@ -56,6 +63,11 @@ iE_Extensions := omit } +function f_init(float Tval := 20.0) runs on test_CT { + g_Tguard.start(Tval); + activate(as_Tguard()); +} + function f_init_s1ap_srv() runs on test_CT { var S1APSRV_ConnParams cpars := { local_ip := mp_mme_bind_ip, @@ -164,6 +176,7 @@ var ConnHdlrPars pars := { seed := 0 }; var ConnHdlr vc_conn; + f_init(); f_init_s1ap_srv(); vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup), pars); @@ -172,6 +185,7 @@ testcase TC_setup_multi() runs on test_CT { var ConnHdlrList vc_conns := { }; + f_init(); f_init_s1ap_srv(); for (var integer i := 0; i < 42; i := i + 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0661a892908bd7b0c06ab5d03d2e28a7f646bc3d Gerrit-Change-Number: 37195 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: cosmetic: ts_SCTP -> c_SctpTuple_S1AP

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37196?usp=email ) Change subject: s1gw: cosmetic: ts_SCTP -> c_SctpTuple_S1AP ...................................................................... s1gw: cosmetic: ts_SCTP -> c_SctpTuple_S1AP Change-Id: Ifc7768014f54645e57090102548649c971ed934b Related: SYS#6772 --- M s1gw/S1AP_Server.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 16 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/s1gw/S1AP_Server.ttcn b/s1gw/S1AP_Server.ttcn index 1128e76..904f106 100644 --- a/s1gw/S1AP_Server.ttcn +++ b/s1gw/S1AP_Server.ttcn @@ -92,9 +92,9 @@ msg := msg }; -template (value) SctpTuple ts_SCTP(template (omit) integer ppid := 18) := { +const SctpTuple c_SctpTuple_S1AP := { sinfo_stream := omit, - sinfo_ppid := ppid, + sinfo_ppid := 18, /* S1AP */ remSocks := omit, assocId := omit }; @@ -195,7 +195,7 @@ runs on S1AP_Server_CT { log("Closing an eNB connection (id=", conn_id, ")"); S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP, conn_id, - { sctp := valueof(ts_SCTP) }); + { sctp := c_SctpTuple_S1AP }); f_conn_del(conn_id); } @@ -356,7 +356,7 @@ map(self:S1AP, system:S1AP_CODEC_PT); res := S1AP_CodecPort_CtrlFunct.f_IPL4_listen(S1AP, cpars.local_ip, cpars.local_port, - { sctp := valueof(ts_SCTP) }); + { sctp := c_SctpTuple_S1AP }); if (not ispresent(res.connId)) { setverdict(fail, "Could not create an S1AP socket, check your configuration"); mtc.stop; diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 55d302e..6b569eb 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -103,7 +103,7 @@ res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB, mp_s1gw_ip, 36412, "0.0.0.0", 0, -1, - { sctp := valueof(ts_SCTP) }); + { sctp := c_SctpTuple_S1AP }); if (not ispresent(res.connId)) { setverdict(fail, "Could not create an S1AP socket, check your configuration"); mtc.stop; @@ -117,7 +117,7 @@ var Result res; S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id, - { sctp := valueof(ts_SCTP) }); + { sctp := c_SctpTuple_S1AP }); g_s1ap_conn_id := -1; unmap(self:S1AP_ENB, system:S1AP_CODEC_PT); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37196?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifc7768014f54645e57090102548649c971ed934b Gerrit-Change-Number: 37196 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: f_ConnHdlr_connect(): wait for SCTP_COMM_UP event

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37198?usp=email ) Change subject: s1gw: f_ConnHdlr_connect(): wait for SCTP_COMM_UP event ...................................................................... s1gw: f_ConnHdlr_connect(): wait for SCTP_COMM_UP event Change-Id: I953e3527fd3abef9efc7365544296a3df0b8f59f Related: SYS#6772 --- M s1gw/S1GW_Tests.ttcn M s1gw/gen_links.sh 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 6b569eb..6237557 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -28,6 +28,7 @@ import from S1AP_PDU_Contents all; import from S1AP_Constants all; +import from SCTP_Templates all; import from S1AP_Server all; modulepar { @@ -98,8 +99,11 @@ function f_ConnHdlr_connect() runs on ConnHdlr { var Result res; + timer T; map(self:S1AP_ENB, system:S1AP_CODEC_PT); + + /* initiate SCTP connection establishment */ res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB, mp_s1gw_ip, 36412, "0.0.0.0", 0, -1, @@ -110,7 +114,18 @@ } g_s1ap_conn_id := res.connId; - log("eNB connection established"); + /* wait for the establishment confirmation */ + T.start(2.0); + alt { + [] S1AP_ENB.receive(tr_SctpAssocChange(SCTP_COMM_UP, g_s1ap_conn_id)) { + log("eNB connection established"); + } + [] S1AP_ENB.receive(PortEvent:{sctpEvent := ?}) { repeat; } + [] T.timeout { + setverdict(fail, "eNB connection establishment timeout"); + self.stop; + } + } } function f_ConnHdlr_disconnect() runs on ConnHdlr { diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index 9587c59..fd54815 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -26,6 +26,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I953e3527fd3abef9efc7365544296a3df0b8f59f Gerrit-Change-Number: 37198 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_conn_term_{by_mme,mme_unavail}

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37199?usp=email ) Change subject: s1gw: add TC_conn_term_{by_mme,mme_unavail} ...................................................................... s1gw: add TC_conn_term_{by_mme,mme_unavail} Change-Id: I5ac2020160c914db0882f148469570cfb142b18d Related: SYS#6772 --- M s1gw/S1GW_Tests.ttcn 1 file changed, 70 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 6237557..30dcd46 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -90,8 +90,10 @@ var ConnHdlr vc_conn; vc_conn := ConnHdlr.create("ConnHdlr-" & testcasename()); - connect(vc_conn:S1AP_CONN, vc_S1APSRV:S1AP_CLIENT); - connect(vc_conn:S1AP_PROC, vc_S1APSRV:S1AP_PROC); + if (vc_S1APSRV.running) { + connect(vc_conn:S1AP_CONN, vc_S1APSRV:S1AP_CLIENT); + connect(vc_conn:S1AP_PROC, vc_S1APSRV:S1AP_PROC); + } vc_conn.start(derefers(fn)(pars)); return vc_conn; @@ -214,9 +216,65 @@ } } + +/* MME terminates connection, expect S1GW to terminate the eNB connection */ +function f_TC_conn_term_by_mme(ConnHdlrPars pars) runs on ConnHdlr { + var Global_ENB_ID genb_id := valueof(ts_Global_ENB_ID(pars.seed)); + + f_ConnHdlr_register(genb_id); + + f_ConnHdlr_connect(); + f_ConnHdlr_setup(genb_id); + f_sleep(0.5); /* keep the connection idle for some time */ + + /* MME (S1AP_Server_CT) terminates connection */ + f_ConnHdlr_close_conn(genb_id); + /* expect our eNB connection to be released gracefully */ + S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); + S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); + S1AP_ENB.receive(PortEvent:{connClosed := ?}); + + f_ConnHdlr_unregister(genb_id); +} +testcase TC_conn_term_by_mme() runs on test_CT { + var ConnHdlrPars pars := { seed := 0 }; + var ConnHdlr vc_conn; + + f_init(); + f_init_s1ap_srv(); + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_conn_term_by_mme), pars); + vc_conn.done; +} + + +/* MME is not available, expect S1GW to terminate the eNB connection */ +function f_TC_conn_term_mme_unavail(ConnHdlrPars pars) runs on ConnHdlr { + /* establish an eNB connection to the S1GW */ + f_ConnHdlr_connect(); + /* expect our eNB connection to be released gracefully */ + S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); + S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); + S1AP_ENB.receive(PortEvent:{connClosed := ?}); + setverdict(pass); +} +testcase TC_conn_term_mme_unavail() runs on test_CT { + var ConnHdlrPars pars := { seed := 0 }; + var ConnHdlr vc_conn; + + f_init(); + f_init_s1ap_srv(); + vc_S1APSRV.stop; + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_conn_term_mme_unavail), pars); + vc_conn.done; +} + control { execute( TC_setup() ); execute( TC_setup_multi() ); + execute( TC_conn_term_by_mme() ); + execute( TC_conn_term_mme_unavail() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37199?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ac2020160c914db0882f148469570cfb142b18d Gerrit-Change-Number: 37199 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: library: de-duplicate SCTP related templates

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37197?usp=email ) Change subject: library: de-duplicate SCTP related templates ...................................................................... library: de-duplicate SCTP related templates Change-Id: Ic2a0cba0cfb1909ccbd1ade9565d508fd239f78c Related: SYS#6772 --- M cbc/gen_links.sh M dia2gsup/gen_links.sh M epdg/gen_links.sh M ggsn_tests/gen_links.sh M hnbgw/gen_links.sh M hnodeb/gen_links.sh M hss/gen_links.sh M library/DIAMETER_Emulation.ttcn M library/GTPv2_Emulation.ttcn M library/Iuh_Emulation.ttcn M library/S1AP_Emulation.ttcn A library/SCTP_Templates.ttcn M library/SGsAP_Emulation.ttcn M library/sbcap/SBC_AP_Adapter.ttcn M library/sbcap/SBC_AP_CodecPort.ttcn M mme/gen_links.sh M msc/gen_links.sh M pgw/gen_links.sh M stp/STP_Tests_M3UA.ttcn M stp/gen_links.sh 20 files changed, 125 insertions(+), 131 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh index 3bb9e77..5c767e4 100755 --- a/cbc/gen_links.sh +++ b/cbc/gen_links.sh @@ -57,6 +57,7 @@ FILES+="BSSMAP_Templates.ttcn " FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/dia2gsup/gen_links.sh b/dia2gsup/gen_links.sh index d653781..f406ebb 100755 --- a/dia2gsup/gen_links.sh +++ b/dia2gsup/gen_links.sh @@ -41,6 +41,7 @@ FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index 55e449f..a0b2871 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -63,6 +63,7 @@ FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="ICMP_Templates.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index c79e4a8..bc17b64 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -65,6 +65,7 @@ FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " FILES+="ICMP_Templates.ttcn ICMPv6_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index 62b3e44..e11b915 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -104,7 +104,7 @@ 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.ttcn " FILES+="L3_Templates.ttcn L3_Common.ttcn " - +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh index e4f453e..35aa039 100755 --- a/hnodeb/gen_links.sh +++ b/hnodeb/gen_links.sh @@ -66,6 +66,7 @@ FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn " FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn GSM_Types.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/hss/gen_links.sh b/hss/gen_links.sh index 7160832..276eb1e 100755 --- a/hss/gen_links.sh +++ b/hss/gen_links.sh @@ -25,6 +25,7 @@ FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index 69107d4..e5698fd 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -39,6 +39,7 @@ import from IPL4asp_Types all; import from TCCConversion_Functions all; import from Native_Functions all; +import from SCTP_Templates all; type hexstring IMSI; @@ -308,24 +309,6 @@ } } -private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := omit) := { - sinfo_stream := omit, - sinfo_ppid := ppid, - remSocks := omit, - assocId := omit -}; - -private template PortEvent tr_SctpAssocChange := { - sctpEvent := { - sctpAssocChange := ? - } -} -private template PortEvent tr_SctpPeerAddrChange := { - sctpEvent := { - sctpPeerAddrChange := ? - } -} - private function f_diameter_xceive(template (value) PDU_DIAMETER tx, template PDU_DIAMETER rx_t := ?) runs on DIAMETER_Emulation_CT return PDU_DIAMETER { @@ -341,7 +324,7 @@ mtc.stop; } [] DIAMETER.receive(tr_SctpAssocChange) { repeat; } - [] DIAMETER.receive(tr_SctpPeerAddrChange) { repeat; } + [] DIAMETER.receive(tr_SctpPeerAddrChange) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for ", rx_t); mtc.stop; @@ -360,10 +343,12 @@ map(self:DIAMETER, system:DIAMETER_CODEC_PT); if (server_mode) { - res := DIAMETER_CodecPort_CtrlFunct.f_IPL4_listen(DIAMETER, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + res := DIAMETER_CodecPort_CtrlFunct.f_IPL4_listen(DIAMETER, p.local_ip, p.local_sctp_port, + { sctp := valueof(ts_SctpTuple) }); } else { res := DIAMETER_CodecPort_CtrlFunct.f_IPL4_connect(DIAMETER, p.remote_ip, p.remote_sctp_port, - p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + p.local_ip, p.local_sctp_port, -1, + { sctp := valueof(ts_SctpTuple) }); } if (not ispresent(res.connId)) { setverdict(fail, "Could not connect DIAMETER socket, check your configuration"); @@ -459,7 +444,7 @@ } } [] DIAMETER.receive(tr_SctpAssocChange) { } - [] DIAMETER.receive(tr_SctpPeerAddrChange) { } + [] DIAMETER.receive(tr_SctpPeerAddrChange) { } [] DIAMETER_PROC.getcall(DIAMETEREM_register_imsi:{?,?}) -> param(imsi, vc_conn) { f_create_expect(imsi, vc_conn); DIAMETER_PROC.reply(DIAMETEREM_register_imsi:{imsi, vc_conn}) to vc_conn; diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index f3f09f8..15720f9 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -21,6 +21,7 @@ import from GTPv2_Templates all; import from GTPv2_CodecPort all; import from GTPv2_CodecPort_CtrlFunct all; +import from SCTP_Templates all; import from UECUPS_Types all; import from UECUPS_CodecPort all; @@ -431,13 +432,6 @@ return false; } -private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := omit) := { - sinfo_stream := omit, - sinfo_ppid := ppid, - remSocks := omit, - assocId := omit -}; - function tr_UECUPS_RecvFrom_R(template PDU_UECUPS msg) runs on GTPv2_Emulation_CT return template UECUPS_RecvFrom { var template UECUPS_RecvFrom mrf := { @@ -452,17 +446,6 @@ } -private template PortEvent tr_SctpAssocChange := { - sctpEvent := { - sctpAssocChange := ? - } -} -private template PortEvent tr_SctpPeerAddrChange := { - sctpEvent := { - sctpPeerAddrChange := ? - } -} - private function f_uecups_xceive(template (value) PDU_UECUPS tx, template PDU_UECUPS rx_t := ?, float time_out := 10.0) runs on GTPv2_Emulation_CT return PDU_UECUPS { @@ -474,7 +457,7 @@ alt { [] UECUPS.receive(tr_UECUPS_RecvFrom_R(rx_t)) -> value mrf { } [] UECUPS.receive(tr_SctpAssocChange) { repeat; } - [] UECUPS.receive(tr_SctpPeerAddrChange) { repeat; } + [] UECUPS.receive(tr_SctpPeerAddrChange) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for ", rx_t); mtc.stop; @@ -504,7 +487,8 @@ if (g_gtp2_cfg.use_gtpu_daemon) { map(self:UECUPS, system:UECUPS); - res := UECUPS_CodecPort_CtrlFunct.f_IPL4_connect(UECUPS, mp_uecups_host, mp_uecups_port, "", -1, -1, { sctp := valueof(ts_SCTP) }); + res := UECUPS_CodecPort_CtrlFunct.f_IPL4_connect(UECUPS, mp_uecups_host, mp_uecups_port, "", -1, -1, + { sctp := valueof(ts_SctpTuple) }); if (not ispresent(res.connId)) { setverdict(fail, "Could not connect UECUPS socket, check your configuration"); testcase.stop; diff --git a/library/Iuh_Emulation.ttcn b/library/Iuh_Emulation.ttcn index e05afe5..e1f283f 100644 --- a/library/Iuh_Emulation.ttcn +++ b/library/Iuh_Emulation.ttcn @@ -31,6 +31,7 @@ import from RUA_IEs all; import from RUA_Templates all; import from Iuh_Types all; +import from SCTP_Templates all; import from General_Types all; import from Misc_Helpers all; @@ -95,24 +96,6 @@ return mrf; } -private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := omit) := { - sinfo_stream := omit, - sinfo_ppid := ppid, - remSocks := omit, - assocId := omit -}; - -private template PortEvent tr_SctpAssocChange := { - sctpEvent := { - sctpAssocChange := ? - } -} -private template PortEvent tr_SctpPeerAddrChange := { - sctpEvent := { - sctpPeerAddrChange := ? - } -} - private function emu_is_server() runs on Iuh_Emulation_CT return boolean { return g_pars.remote_sctp_port == -1 } @@ -148,10 +131,12 @@ map(self:Iuh, system:Iuh_CODEC_PT); if (emu_is_server()) { - res := Iuh_CodecPort_CtrlFunct.f_IPL4_listen(Iuh, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + res := Iuh_CodecPort_CtrlFunct.f_IPL4_listen(Iuh, p.local_ip, p.local_sctp_port, + { sctp := valueof(ts_SctpTuple) }); } else { res := Iuh_CodecPort_CtrlFunct.f_IPL4_connect(Iuh, p.remote_ip, p.remote_sctp_port, - p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + p.local_ip, p.local_sctp_port, -1, + { sctp := valueof(ts_SctpTuple) }); } if (not ispresent(res.connId)) { f_shutdown(__FILE__, __LINE__, fail, "Could not connect Iuh socket, check your configuration"); diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index 955c690..3cce091 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -40,6 +40,7 @@ import from S1AP_PDU_Descriptions all; import from S1AP_IEs all; import from S1AP_Templates all; +import from SCTP_Templates all; import from NAS_EPS_Types all; import from NAS_Templates all; @@ -288,24 +289,6 @@ } } -private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := 18) := { - sinfo_stream := omit, - sinfo_ppid := ppid, - remSocks := omit, - assocId := omit -}; - -private template PortEvent tr_SctpAssocChange := { - sctpEvent := { - sctpAssocChange := ? - } -} -private template PortEvent tr_SctpPeerAddrChange := { - sctpEvent := { - sctpPeerAddrChange := ? - } -} - private function f_s1ap_xceive(template (value) S1AP_PDU tx, template S1AP_PDU rx_t := ?) runs on S1AP_Emulation_CT return S1AP_PDU { @@ -412,10 +395,12 @@ map(self:S1AP, system:S1AP_CODEC_PT); if (p.remote_sctp_port == -1) { - res := S1AP_CodecPort_CtrlFunct.f_IPL4_listen(S1AP, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + res := S1AP_CodecPort_CtrlFunct.f_IPL4_listen(S1AP, p.local_ip, p.local_sctp_port, + { sctp := valueof(ts_SctpTuple(18)) }); } else { res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP, p.remote_ip, p.remote_sctp_port, - p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + p.local_ip, p.local_sctp_port, -1, + { sctp := valueof(ts_SctpTuple(18)) }); } if (not ispresent(res.connId)) { setverdict(fail, "Could not connect S1AP socket, check your configuration"); diff --git a/library/SCTP_Templates.ttcn b/library/SCTP_Templates.ttcn new file mode 100644 index 0000000..f63637f --- /dev/null +++ b/library/SCTP_Templates.ttcn @@ -0,0 +1,68 @@ +module SCTP_Templates { + +/* (C) 2024 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 Socket_API_Definitions all; + +template (value) SctpTuple +ts_SctpTuple(template (omit) integer ppid := omit, + template (omit) AssociationId assoc_id := omit) := { + sinfo_stream := omit, + sinfo_ppid := ppid, + remSocks := omit, + assocId := assoc_id +}; +template SctpTuple +tr_SctpTuple(template integer ppid := *, + template AssociationId assoc_id := *) := { + sinfo_stream := *, + sinfo_ppid := ppid, + remSocks := *, + assocId := assoc_id +}; + + +template Socket_API_Definitions.PortEvent +tr_SctpAssocChange(template (present) SAC_STATE state := ?, + template (present) ConnectionId conn_id := ?, + template (present) SctpTuple sctp := ?) := { + sctpEvent := { + sctpAssocChange := { + clientId := conn_id, + proto := { + sctp := sctp + }, + sac_state := state + } + } +} + +template Socket_API_Definitions.PortEvent +tr_SctpPeerAddrChange(template (present) SPC_STATE state := ?, + template (present) ConnectionId conn_id := ?) := { + sctpEvent := { + sctpPeerAddrChange := { + clientId := conn_id, + spc_state := state + } + } +} + +template Socket_API_Definitions.PortEvent +tr_SctpShutDownEvent(template (present) ConnectionId conn_id := ?) := { + sctpEvent := { + sctpShutDownEvent := { + clientId := conn_id + } + } +} + +} diff --git a/library/SGsAP_Emulation.ttcn b/library/SGsAP_Emulation.ttcn index b860fe2..bb125a5 100644 --- a/library/SGsAP_Emulation.ttcn +++ b/library/SGsAP_Emulation.ttcn @@ -31,6 +31,7 @@ import from SGsAP_CodecPort_CtrlFunct all; import from SGsAP_Types all; import from SGsAP_Templates all; +import from SCTP_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; import from DNS_Helpers all; @@ -245,24 +246,6 @@ return omit; } -private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := omit) := { - sinfo_stream := omit, - sinfo_ppid := ppid, - remSocks := omit, - assocId := omit -}; - -private template PortEvent tr_SctpAssocChange := { - sctpEvent := { - sctpAssocChange := ? - } -} -private template PortEvent tr_SctpPeerAddrChange := { - sctpEvent := { - sctpPeerAddrChange := ? - } -} - private function f_sgsap_xceive(template (value) PDU_SGsAP tx, template PDU_SGsAP rx_t := ?) runs on SGsAP_Emulation_CT return PDU_SGsAP { @@ -290,10 +273,12 @@ map(self:SGsAP, system:SGsAP_CODEC_PT); if (p.remote_sctp_port == -1) { - res := SGsAP_CodecPort_CtrlFunct.f_IPL4_listen(SGsAP, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + res := SGsAP_CodecPort_CtrlFunct.f_IPL4_listen(SGsAP, p.local_ip, p.local_sctp_port, + { sctp := valueof(ts_SctpTuple) }); } else { res := SGsAP_CodecPort_CtrlFunct.f_IPL4_connect(SGsAP, p.remote_ip, p.remote_sctp_port, - p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + p.local_ip, p.local_sctp_port, -1, + { sctp := valueof(ts_SctpTuple) }); } if (not ispresent(res.connId)) { setverdict(fail, "Could not connect SGsAP socket, check your configuration"); diff --git a/library/sbcap/SBC_AP_Adapter.ttcn b/library/sbcap/SBC_AP_Adapter.ttcn index 515a723..5adb648 100644 --- a/library/sbcap/SBC_AP_Adapter.ttcn +++ b/library/sbcap/SBC_AP_Adapter.ttcn @@ -21,6 +21,7 @@ import from IPL4asp_Types all; import from IPL4asp_PortType all; import from Socket_API_Definitions all; +import from SCTP_Templates all; import from Misc_Helpers all; @@ -34,25 +35,14 @@ var IPL4asp_Types.ConnectionId g_SBC_AP_conn_id[NUM_SBC_AP] := { -1, -1, -1 }; } -private template Socket_API_Definitions.PortEvent tr_SctpAssocChange_COMM_UP(IPL4asp_Types.ConnectionId id) := { - sctpEvent := { - sctpAssocChange := { - clientId := id, - proto := { - sctp := ? - }, - sac_state := SCTP_COMM_UP - } - } -} - function f_connect(charstring remote_host, IPL4asp_Types.PortNumber remote_port, charstring local_host, IPL4asp_Types.PortNumber local_port, integer idx := 0) runs on SBC_AP_Adapter_CT { var IPL4asp_Types.Result res; map(self:SBC_AP[idx], system:SBC_AP); res := SBC_AP_CodecPort_CtrlFunct.f_IPL4_connect(SBC_AP[idx], remote_host, remote_port, - local_host, local_port, 0, { sctp := valueof(ts_SBC_AP_SctpTuple) }); + local_host, local_port, 0, + { sctp := c_SBC_AP_SctpTuple }); if (not ispresent(res.connId)) { setverdict(fail, "Could not connect to SBC_AP port, check your configuration"); mtc.stop; @@ -61,7 +51,7 @@ timer Tcommup := 10.0; Tcommup.start; alt { - [] SBC_AP[idx].receive(tr_SctpAssocChange_COMM_UP(g_SBC_AP_conn_id[idx])) {} + [] SBC_AP[idx].receive(tr_SctpAssocChange(SCTP_COMM_UP, g_SBC_AP_conn_id[idx])) {} [] Tcommup.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting SCTP_COMM_UP"); } @@ -73,7 +63,8 @@ runs on SBC_AP_Adapter_CT { var IPL4asp_Types.Result res; map(self:SBC_AP[idx], system:SBC_AP); - res := SBC_AP_CodecPort_CtrlFunct.f_IPL4_listen(SBC_AP[idx], local_host, local_port, { sctp := valueof(ts_SBC_AP_SctpTuple) }); + res := SBC_AP_CodecPort_CtrlFunct.f_IPL4_listen(SBC_AP[idx], local_host, local_port, + { sctp := c_SBC_AP_SctpTuple }); g_SBC_AP_conn_id[idx] := res.connId; } @@ -87,7 +78,7 @@ timer Tcommup := 10.0; Tcommup.start; alt { - [] SBC_AP[idx].receive(tr_SctpAssocChange_COMM_UP(g_SBC_AP_conn_id[idx])) {} + [] SBC_AP[idx].receive(tr_SctpAssocChange(SCTP_COMM_UP, g_SBC_AP_conn_id[idx])) {} [] Tcommup.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting SCTP_COMM_UP"); } diff --git a/library/sbcap/SBC_AP_CodecPort.ttcn b/library/sbcap/SBC_AP_CodecPort.ttcn index bd17031..881e189 100644 --- a/library/sbcap/SBC_AP_CodecPort.ttcn +++ b/library/sbcap/SBC_AP_CodecPort.ttcn @@ -32,7 +32,7 @@ SBC_AP_PDU msg }; - template (value) SctpTuple ts_SBC_AP_SctpTuple := { + const SctpTuple c_SBC_AP_SctpTuple := { sinfo_stream := omit, sinfo_ppid := c_SBC_AP_PPID, remSocks := omit, @@ -65,7 +65,7 @@ private function SBC_AP_to_IPL4_Send(in SBC_AP_Send pin, out ASP_Send pout) { pout.connId := pin.connId; pout.proto := { - sctp := valueof(ts_SBC_AP_SctpTuple) + sctp := c_SBC_AP_SctpTuple }; pout.msg := enc_SBC_AP_PDU(pin.msg); } with { extension "prototype(fast)" }; diff --git a/mme/gen_links.sh b/mme/gen_links.sh index be08870..dad9c23 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -81,6 +81,7 @@ FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/msc/gen_links.sh b/msc/gen_links.sh index a15c42d..93e339c 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -102,6 +102,7 @@ FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn " FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 9bdface..07907e7 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -65,6 +65,7 @@ FILES+="DNS_Helpers.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_229_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 24b3ae1..9c45a32 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -33,6 +33,7 @@ import from SCCP_Templates all; import from SCCPasp_Types all; import from SCCP_Emulation all; +import from SCTP_Templates all; import from STP_Tests_Common all; @@ -151,16 +152,6 @@ var integer g_m3ua_conn_id[NR_M3UA+NR_M3UA_SRV]; } -private template PortEvent tr_SctpAssocChange := { - sctpEvent := { - sctpAssocChange := ? - } -} -private template PortEvent tr_SctpPeerAddrChange := { - sctpEvent := { - sctpPeerAddrChange := ? - } -} private template PortEvent tr_ConnOpened := { connOpened := ? } diff --git a/stp/gen_links.sh b/stp/gen_links.sh index aaf3421..ad5d605 100755 --- a/stp/gen_links.sh +++ b/stp/gen_links.sh @@ -52,6 +52,7 @@ FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="SCCP_Templates.ttcn " FILES+="M3UA_Templates.ttcn M3UA_CodecPort.ttcn M3UA_CodecPort_CtrlFunct.ttcn M3UA_CodecPort_CtrlFunctDef.cc " +FILES+="SCTP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37197?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic2a0cba0cfb1909ccbd1ade9565d508fd239f78c Gerrit-Change-Number: 37197 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: start the guard timer (20.0s by default)

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37195?usp=email ) Change subject: s1gw: start the guard timer (20.0s by default) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0661a892908bd7b0c06ab5d03d2e28a7f646bc3d Gerrit-Change-Number: 37195 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jun 2024 14:32:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: cosmetic: ts_SCTP -> c_SctpTuple_S1AP

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37196?usp=email ) Change subject: s1gw: cosmetic: ts_SCTP -> c_SctpTuple_S1AP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37196?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifc7768014f54645e57090102548649c971ed934b Gerrit-Change-Number: 37196 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jun 2024 14:32:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_conn_term_{by_mme,mme_unavail}

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37199?usp=email ) Change subject: s1gw: add TC_conn_term_{by_mme,mme_unavail} ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37199?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ac2020160c914db0882f148469570cfb142b18d Gerrit-Change-Number: 37199 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jun 2024 14:12:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024