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

[L] Change in osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_pdp_act_user

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37593?usp=email to look at the new patch set (#2). Change subject: sgsn: Introduce test TC_attach_pdp_act_user ...................................................................... sgsn: Introduce test TC_attach_pdp_act_user Related: SYS#5435 Change-Id: I5f0cb51457395d95bde22732b032786211cb7b61 --- M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 247 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/37593/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37593?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: I5f0cb51457395d95bde22732b032786211cb7b61 Gerrit-Change-Number: 37593 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Set up GTPv1U in emulated RNCs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37592?usp=email ) Change subject: sgsn: Set up GTPv1U in emulated RNCs ...................................................................... sgsn: Set up GTPv1U in emulated RNCs Change-Id: Icf5fa28ea08cfd255b49b546eadd74e91a9c7ecf --- M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 50 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/37592/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 8274d43..92f081d 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -164,12 +164,17 @@ type record length(NUM_GB) of NSConfiguration NSConfigurations; const integer NUM_RNC := 1; +type record IuInstance { + RAN_Adapter ranap, + GTP_Emulation_CT vc_RNC_GTP +}; +type record length(NUM_RNC) of IuInstance IuInstances; type record of RAN_Configuration RAN_Configurations; type component test_CT { var GbInstances g_gb; - var RAN_Adapter g_ranap[NUM_RNC]; - var boolean g_ranap_enable := false; + var IuInstances g_iu; + var boolean g_iu_enable := false; var GSUP_Emulation_CT vc_GSUP; var IPA_Emulation_CT vc_GSUP_IPA; @@ -267,6 +272,21 @@ } } +private function f_init_rnc_gtp(charstring id, integer rnc_idx) runs on test_CT { + id := id & "-RNC_GTP"; + + var GtpEmulationCfg gtp_cfg := { + gtpc_bind_ip := omit, + gtpc_bind_port := omit, + gtpu_bind_ip := mp_ranap_cfg[rnc_idx].sctp_addr.local_ip_addr, + gtpu_bind_port := GTP1U_PORT, + sgsn_role := false + }; + + g_iu[rnc_idx].vc_RNC_GTP := GTP_Emulation_CT.create(id); + g_iu[rnc_idx].vc_RNC_GTP.start(GTP_Emulation.main(gtp_cfg)); +} + private function f_init_ggsn_gtp(charstring id) runs on test_CT { id := id & "-GGSN_GTP"; @@ -376,10 +396,11 @@ f_init_gb(g_gb[1], "SGSN_Test-Gb1", 1); f_init_gb(g_gb[2], "SGSN_Test-Gb2", 2); - if (g_ranap_enable) { + if (g_iu_enable) { for (i := 0; i < NUM_RNC; i := i+1) { - f_ran_adapter_init(g_ranap[i], mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps); - f_ran_adapter_start(g_ranap[i]); + f_ran_adapter_init(g_iu[i].ranap, mp_ranap_cfg[i], "SGSN_Test_" & int2str(i), RNC_RanOps); + f_ran_adapter_start(g_iu[i].ranap); + f_init_rnc_gtp("SGSN_Test", i); } } f_init_gsup("SGSN_Test"); @@ -389,9 +410,9 @@ function f_cleanup() runs on test_CT { var integer i; - if (g_ranap_enable) { + if (g_iu_enable) { for (i := 0; i < NUM_RNC; i := i+1) { - f_ran_adapter_cleanup(g_ranap[i]); + f_ran_adapter_cleanup(g_iu[i].ranap); } } self.stop; @@ -438,9 +459,9 @@ gb[2].cfg.bvc[0].cell_id } pars := f_new_BSSGP_ConnHdlrPars(imsi_suffix, cell_ids, t_NetPars(expect_ciph := expect_ciph), t_guard := t_guard); - if (g_ranap_enable) { - pars.sccp_addr_local := g_ranap[0].sccp_addr_own; - pars.sccp_addr_peer := g_ranap[0].sccp_addr_peer; + 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; } vc_conn := BSSGP_ConnHdlr.create(id); @@ -461,9 +482,15 @@ connect(vc_conn:BSSGP_GLOBAL[2], gb[2].vc_BSSGP:GLOBAL); /* FIXME: support multiple RNCs */ - if (g_ranap_enable) { - connect(vc_conn:BSSAP, g_ranap[0].vc_RAN:CLIENT); - connect(vc_conn:BSSAP_PROC, g_ranap[0].vc_RAN:PROC); + if (g_iu_enable) { + connect(vc_conn:BSSAP, g_iu[0].ranap.vc_RAN:CLIENT); + connect(vc_conn:BSSAP_PROC, g_iu[0].ranap.vc_RAN:PROC); + + for (var integer i := 0; i < NUM_RNC; i := i+1) { + /* GTP[0] is used by emulated GGSN: */ + connect(vc_conn:GTP[i + 1], g_iu[i].vc_RNC_GTP:CLIENT); + connect(vc_conn:GTP_PROC[i + 1], g_iu[i].vc_RNC_GTP:CLIENT_PROC); + } } connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 9825150..84679cd 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -15,7 +15,7 @@ import from BSSGP_ConnHdlr all; private function f_init() runs on test_CT { - g_ranap_enable := true; + g_iu_enable := true; SGSN_Tests.f_init(); /* default VTY configuration */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37592?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: Icf5fa28ea08cfd255b49b546eadd74e91a9c7ecf Gerrit-Change-Number: 37592 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: WIP: sgsn: Introduce test TC_attach_pdp_act_user

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37593?usp=email ) Change subject: WIP: sgsn: Introduce test TC_attach_pdp_act_user ...................................................................... WIP: sgsn: Introduce test TC_attach_pdp_act_user Change-Id: I5f0cb51457395d95bde22732b032786211cb7b61 --- M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 246 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/37593/1 diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index 5847ac0..29b8f38 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -4,6 +4,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from Native_Functions all; +import from Misc_Helpers all; import from NS_Types all; import from NS_Emulation all; import from BSSGP_Types all; @@ -23,10 +24,12 @@ import from IPA_Emulation all; import from RAN_Adapter all; +import from RANAP_Constants all; +import from RANAP_PDU_Descriptions all; +import from RANAP_PDU_Contents all; +import from RANAP_IEs all; import from RAN_Emulation all; import from RANAP_Templates all; -import from RANAP_PDU_Descriptions all; -import from RANAP_IEs all; import from GTPv1C_CodecPort all; import from GTPv1U_CodecPort all; @@ -51,6 +54,9 @@ /* Emulated GGSN is at GTP_ConnHdlr.GTP[0] */ const integer GTP_GGSN_IDX := 0; +private function ran2gtp_idx(integer ran_index) return integer { + return ran_index + 1 - NUM_GB; +} type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr, RAN_ConnHdlr { var BSSGP_ConnHdlrPars g_pars; @@ -145,7 +151,7 @@ /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); /* tell GTP dispatcher to send this IMSI to us */ - f_gtp_register_imsi(g_pars.imsi); + f_gtp_register_imsi(g_pars.imsi, GTP_GGSN_IDX); g_Tguard.start(pars.t_guard); activate(as_Tguard()); @@ -489,6 +495,8 @@ /* IuPS case: Expect Iu Release */ if (is_iu(ran_index)) { as_iu_release_compl_disc(); + /* Next message will be an InitialUE since conn was torn down */ + g_pars.rnc_send_initial_ue := true; } /* Race condition @@ -603,6 +611,52 @@ } } +/* Iu only */ +altstep as_service_request(integer ran_index := 0) runs on BSSGP_ConnHdlr { + var PDU_DTAP_PS_MT mt; + + [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_SERVICE_ACC)) -> value mt { + setverdict(pass); + } + [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_SERVICE_REJ)) { + setverdict(fail, "Unexpected Service Reject"); + mtc.stop; + } + [] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?, + uia_key := oct2bit(g_pars.vec.ik), + key_sts := ?)) { + var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */ + BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen)); + BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))) + repeat; + } +} + +function f_service_request(ServiceType service_type := SERVICE_TYPE_Signalling, + integer ran_index := 0, + float Tval := 2.0) runs on BSSGP_ConnHdlr { + timer T := Tval; + + if (not is_iu(ran_index)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "GMM Service Request called on non-Iu RAN index"); + } + + + f_send_l3(ts_GMM_SERVICE_REQ(service_type, p_tmsi := g_pars.p_tmsi), ran_index); + + T.start; + alt { + [] as_service_request(ran_index) { setverdict(pass); } + [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; } + [is_iu(ran_index)] BSSAP.receive { repeat; } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Timeout completing the RAU procedure"); + } + } +} + type record PdpActPars { BIT3 tid, /* L3 Transaction ID */ BIT4 nsapi, /* SNDCP NSAPI */ @@ -621,6 +675,9 @@ octetstring ggsn_ip_u, /* GGSN IP User */ OCT1 ggsn_restart_ctr, /* GGSN Restart Counter */ + OCT4 rnc_tei_u, /* SGSN TEI User */ + octetstring rnc_ip_u, /* SGSN IP USer */ + OCT4 sgsn_tei_c optional, /* SGSN TEI Control */ OCT4 sgsn_tei_u optional, /* SGSN TEI User */ octetstring sgsn_ip_c optional, /* SGSN IP Control */ @@ -634,33 +691,26 @@ apars.sgsn_tei_u := gtpc_rx.createPDPContextRequest.teidDataI.teidDataI; apars.sgsn_ip_c := gtpc_rx.createPDPContextRequest.sgsn_addr_signalling.addressf; apars.sgsn_ip_u := gtpc_rx.createPDPContextRequest.sgsn_addr_traffic.addressf; - f_gtp_register_teid(apars.ggsn_tei_c); - f_gtp_register_teid(apars.ggsn_tei_u); + f_gtp_register_teid(apars.ggsn_tei_c, GTP_GGSN_IDX); + f_gtp_register_teid(apars.ggsn_tei_u, GTP_GGSN_IDX); } -function f_pdp_ctx_act(inout PdpActPars apars, boolean send_recovery := false, integer ran_index := 0) -runs on BSSGP_ConnHdlr { +function f_process_gtp_ctx_upd_req(inout PdpActPars apars, PDU_GTPC gtpc, integer ran_index := 0) runs on BSSGP_ConnHdlr { + var UpdatePDPContextRequestSGSN upd := gtpc.gtpc_pdu.updatePDPContextRequest.updatePDPContextRequestSGSN; + if (ispresent(upd.teidControlPlane.teidControlPlane)) { + apars.sgsn_tei_c := upd.teidControlPlane.teidControlPlane; + } + apars.sgsn_tei_u := upd.teidDataI.teidDataI; + apars.sgsn_ip_c := upd.sgsn_addr_controlPlane.addressf; + apars.sgsn_ip_u := upd.sgsn_addr_traffic.addressf; + f_gtp_register_teid(apars.rnc_tei_u, ran2gtp_idx(ran_index)); + /* TODO: If "Direct Tunnel" flag, update apars.rnc_{tei,ip}_u instead, + * and store "direct_tunnel" in ggsn state */ +} + +altstep as_pdp_ctx_act_gb(inout PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { var boolean exp_rej := ispresent(apars.exp_rej_cause); - var Gtp1cUnitdata g_ud; - var template Recovery_gtpc recovery := omit; - if (send_recovery) { - recovery := ts_Recovery(apars.ggsn_restart_ctr); - } - - f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, - apars.apn, apars.pco), ran_index); - GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { - f_process_gtp_ctx_act_req(apars, g_ud.gtpc); - var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - GTP[GTP_GGSN_IDX].send(ts_GTPC_CreatePdpResp(g_ud.peer, seq_nr, - apars.sgsn_tei_c, apars.gtp_resp_cause, - apars.ggsn_tei_c, apars.ggsn_tei_u, - apars.nsapi, - apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, - omit, recovery)); - } - alt { [exp_rej] BSSGP[ran_index].receive(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause)) { setverdict(pass); } @@ -680,6 +730,92 @@ setverdict(pass); } [] as_xid(apars, ran_index); +} +altstep as_pdp_ctx_act_iu(inout PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { + var boolean exp_rej := ispresent(apars.exp_rej_cause); + + [exp_rej] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause))) { + setverdict(pass); + } + [exp_rej] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_ACT_PDP_ACCEPT)) { + setverdict(fail, "Unexpected PDP CTX ACT ACC"); + mtc.stop; + } + [not exp_rej] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { + setverdict(fail, "Unexpected PDP CTX ACT FAIL"); + mtc.stop; + } + [not exp_rej] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { + setverdict(fail, "Unexpected PDP CTX ACT FAIL"); + mtc.stop; + } + [not exp_rej] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_ACT_PDP_ACCEPT(apars.tid, apars.sapi))) { + setverdict(pass); + } +} +altstep as_pdp_ctx_act(inout PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { + [is_gb(ran_index)] as_pdp_ctx_act_gb(apars, ran_index); + [is_iu(ran_index)] as_pdp_ctx_act_iu(apars, ran_index); +} + +function f_pdp_ctx_act(inout PdpActPars apars, boolean send_recovery := false, integer ran_index := 0, float Tval := 5.0) +runs on BSSGP_ConnHdlr { + var Gtp1cUnitdata g_ud; + var template Recovery_gtpc recovery := omit; + timer T := Tval; + + f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + apars.apn, apars.pco), ran_index); + + if (send_recovery) { + recovery := ts_Recovery(apars.ggsn_restart_ctr); + } + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { + f_process_gtp_ctx_act_req(apars, g_ud.gtpc); + var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + GTP[GTP_GGSN_IDX].send(ts_GTPC_CreatePdpResp(g_ud.peer, seq_nr, + apars.sgsn_tei_c, apars.gtp_resp_cause, + apars.ggsn_tei_c, apars.ggsn_tei_u, + apars.nsapi, + apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, + omit, recovery)); + } + + T.start; + if (is_iu(ran_index)) { + var RANAP_PDU ranap; + alt { + [] BSSAP.receive(tr_RANAP_RabAssReq(?)) -> value ranap { + var RAB_ID rab_id := f_ranap_rab_ass_req_extract_rab_id(ranap); + var template (value) RAB_SetupOrModifiedList l; + l := ts_RAB_SMdL_ps(rab_id, oct2bit(apars.rnc_ip_u), apars.rnc_tei_u); + BSSAP.send(ts_RANAP_RabAssResp(l)); + + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, updatePDPContextRequest, ?)) -> value g_ud { + f_process_gtp_ctx_upd_req(apars, g_ud.gtpc, ran_index); + var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); + GTP[GTP_GGSN_IDX].send(ts_GTPC_UpdatePdpRespGGSN(g_ud.peer, seq_nr, + apars.sgsn_tei_c, apars.gtp_resp_cause, + apars.ggsn_tei_c, apars.ggsn_tei_u, + apars.ggsn_ip_c, apars.ggsn_ip_u, apars.chg_id, + omit, recovery)); + } + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Timeout completing the PDP ACT"); + } + } + } + + alt { + [] as_pdp_ctx_act(apars, ran_index) { setverdict(pass); } + [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; } + [is_iu(ran_index)] BSSAP.receive { repeat; } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Timeout completing the PDP ACT"); + } } } @@ -691,15 +827,17 @@ f_send_l3(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit), ran_index); GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - BSSGP[ran_index].clear; + if (is_gb(ran_index)) { + BSSGP[ran_index].clear; + } GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } alt { - [] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)) { - setverdict(pass); - } - [] as_xid(apars, ran_index); + [is_gb(ran_index)] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)); + [is_gb(ran_index)] as_xid(apars, ran_index); + [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))); } + setverdict(pass); } function f_pdp_ctx_deact_mt(inout PdpActPars apars, boolean error_ind := false, integer ran_index := 0) @@ -720,7 +858,10 @@ T.start; alt { - [] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { + [is_gb(ran_index)] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { + f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), ran_index); + } + [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), ran_index); } [not error_ind] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { @@ -782,7 +923,8 @@ addressInfo := omit } -template (value) PdpActPars t_PdpActPars(charstring ggsn_ip) := { +template (value) PdpActPars t_PdpActPars(charstring ggsn_ip, + charstring rnc_ip := "127.0.0.1") := { tid := '000'B, nsapi := '0101'B, /* < 5 are reserved */ sapi := '0011'B, /* 3/5/9/11 */ @@ -801,6 +943,9 @@ ggsn_ip_u := f_inet_addr(ggsn_ip), ggsn_restart_ctr := int2oct(2, 1), + rnc_tei_u := f_rnd_octstring(4), + rnc_ip_u := f_inet_addr(rnc_ip), + sgsn_tei_c := omit, sgsn_tei_u := omit, sgsn_ip_c := omit, @@ -863,40 +1008,52 @@ } } -/* Transceive given 'payload' as MT message from GTP -> OsmoSGSN -> Gb */ +/* Transceive given 'payload' as MT message from GTP -> OsmoSGSN -> {Gb,Iu} */ function f_gtpu_xceive_mt(inout PdpActPars apars, octetstring payload, integer ran_index := 0, boolean expect_fwd := true) runs on BSSGP_ConnHdlr { timer T := 5.0; /* Send PDU via GTP from our simulated GGSN to the SGSN */ f_gtpu_send(apars, payload); T.start; - /* Expect PDU via BSSGP/LLC on simulated PCU from SGSN */ + alt { - [] as_xid(apars, ran_index); + /* Expect PDU via BSSGP/LLC on simulated PCU from SGSN: */ + [is_gb(ran_index)] as_xid(apars, ran_index); //[] BSSGP[ran_index].receive(tr_BD_SNDCP(apars.sapi, tr_SN_UD(apars.nsapi, payload))); - [expect_fwd] BSSGP[ran_index].receive(tr_SN_UD(apars.nsapi, payload)); - [expect_fwd] T.timeout { - setverdict(fail, "Timeout waiting for GTP-U to appear on BSSGP"); - mtc.stop; + [is_gb(ran_index) and expect_fwd] BSSGP[ran_index].receive(tr_SN_UD(apars.nsapi, payload)); + [is_gb(ran_index) and not expect_fwd] BSSGP[ran_index].receive(tr_SN_UD(apars.nsapi, payload)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "GTP-U forwarded to BSSGP but not expected"); } - [not expect_fwd] BSSGP[ran_index].receive(tr_SN_UD(apars.nsapi, payload)) { - setverdict(fail, "GTP-U forwarded to BSSGP but not expected") - mtc.stop; + /* Expect PDU directly from RNC (Drect Tunnel): */ + [is_iu(ran_index) and expect_fwd] GTP[ran2gtp_idx(ran_index)].receive(tr_GTPU_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), apars.rnc_tei_u, payload)); + [is_iu(ran_index) and not expect_fwd] GTP[ran2gtp_idx(ran_index)].receive(tr_GTPU_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), apars.rnc_tei_u, payload)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "GTP-U forwarded to BSSGP but not expected") + } + [expect_fwd] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for GTP-U to appear on Gb/Iu"); } [not expect_fwd] T.timeout {} } } -/* Transceive given 'payload' as MO message from Gb -> OsmoSGSN -> GTP */ +/* Transceive given 'payload' as MO message from {Gb,Iu} -> OsmoSGSN -> GTP */ function f_gtpu_xceive_mo(inout PdpActPars apars, octetstring payload, integer ran_index := 0, uint9_t n_u := 0) runs on BSSGP_ConnHdlr { - /* Send PDU via SNDCP/LLC/BSSGP/NS via simulated MS/PCU to the SGSN */ - var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); - var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); - BSSGP[ran_index].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, n_u)); - /* Expect PDU via GTP from SGSN on simulated GGSN */ + var Gtp1uPeer rx_peer; + + if (is_gb(ran_index)) { + /* Send PDU via SNDCP/LLC/BSSGP/NS via simulated MS/PCU to the SGSN: */ + rx_peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); + var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); + BSSGP[ran_index].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, n_u)); + } else if (is_iu(ran_index)) { + /* Send PDU via GTPv1U from simulated MS/RNC directly to the simulated GGSN: */ + rx_peer := valueof(ts_GtpPeerU(apars.rnc_ip_u)); + GTP[ran2gtp_idx(ran_index)].send(ts_GTP1U_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), 0 /*seq*/, apars.ggsn_tei_u, payload)); + } + /* Expect PDU via GTP from RNC/SGSN on simulated GGSN */ alt { - [] GTP[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)); + [] GTP[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(rx_peer, apars.ggsn_tei_u, payload)); } } diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 84679cd..7ee4c51 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -23,7 +23,7 @@ } private function f_TC_iu_attach(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -69,7 +69,7 @@ } private function f_TC_iu_attach_geran_rau(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); @@ -95,7 +95,7 @@ } private function f_TC_geran_attach_iu_rau(charstring id) runs on BSSGP_ConnHdlr { - var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip, mp_ranap_cfg[0].sctp_addr.local_ip_addr)); /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 0); @@ -117,11 +117,38 @@ f_cleanup(); } +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)); + + /* first perform regular attach */ + f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3); + + f_service_request(ran_index := 3); + + f_pdp_ctx_act(apars, ran_index := 3); + + /* then transceive a downlink PDU */ + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 3); + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 3); + + f_pdp_ctx_deact_mo(apars, '00'O, ran_index := 3); + setverdict(pass); +} +testcase TC_attach_pdp_act_user() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user), testcasename(), g_gb, 1001); + vc_conn.done; + f_cleanup(); +} + control { execute( TC_iu_attach() ); execute( TC_iu_attach_encr() ); execute( TC_iu_attach_geran_rau() ); execute( TC_geran_attach_iu_rau() ); + execute( TC_attach_pdp_act_user() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37593?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: I5f0cb51457395d95bde22732b032786211cb7b61 Gerrit-Change-Number: 37593 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: Rename vc_GTP -> vc_GGSN_GTP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37590?usp=email ) Change subject: sgsn: Rename vc_GTP -> vc_GGSN_GTP ...................................................................... sgsn: Rename vc_GTP -> vc_GGSN_GTP GTPv1U will also be used by emulated HNBGWs, hence we want to differentiate them in name. Change-Id: I663e667956935372809c1c42ebe8d4312d6a4d41 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/37590/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 01aab2b..9b9831a 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -183,7 +183,7 @@ port BSSGP_PT RIM[NUM_GB]; port GTPEM_PT GTPC; - var GTP_Emulation_CT vc_GTP; + var GTP_Emulation_CT vc_GGSN_GTP; port TELNETasp_PT SGSNVTY; @@ -267,8 +267,8 @@ } } -private function f_init_gtp(charstring id) runs on test_CT { - id := id & "-GTP"; +private function f_init_ggsn_gtp(charstring id) runs on test_CT { + id := id & "-GGSN_GTP"; var GtpEmulationCfg gtp_cfg := { gtpc_bind_ip := mp_ggsn_ip, @@ -278,8 +278,8 @@ sgsn_role := false }; - vc_GTP := GTP_Emulation_CT.create(id); - vc_GTP.start(GTP_Emulation.main(gtp_cfg)); + vc_GGSN_GTP := GTP_Emulation_CT.create(id); + vc_GGSN_GTP.start(GTP_Emulation.main(gtp_cfg)); } friend function f_init_vty() runs on test_CT { @@ -383,7 +383,7 @@ } } f_init_gsup("SGSN_Test"); - f_init_gtp("SGSN_Test"); + f_init_ggsn_gtp("SGSN_Test"); f_vty_enable_echo_interval(g_use_echo); } @@ -469,8 +469,8 @@ connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); - connect(vc_conn:GTP, vc_GTP:CLIENT); - connect(vc_conn:GTP_PROC, vc_GTP:CLIENT_PROC); + connect(vc_conn:GTP, vc_GGSN_GTP:CLIENT); + connect(vc_conn:GTP_PROC, vc_GGSN_GTP:CLIENT_PROC); vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; @@ -2655,7 +2655,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); /* connect RIM related port */ - connect(vc_GTP:CLIENT_DEFAULT, self:GTPC); + connect(vc_GGSN_GTP:CLIENT_DEFAULT, self:GTPC); var Gtp1cPeer peer := { connId := 1, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37590?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: I663e667956935372809c1c42ebe8d4312d6a4d41 Gerrit-Change-Number: 37590 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/GTP_Emulation: Make GTPv1C port optional

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37589?usp=email ) Change subject: library/GTP_Emulation: Make GTPv1C port optional ...................................................................... library/GTP_Emulation: Make GTPv1C port optional The port is not needed when emulating HNBGW, since the setup of GTPv1U happens through RAB-ASsReq/resp. Change-Id: I3ffb54d0cb8b3a81ed5235feaaac6d989baf6e0d --- M library/GTP_Emulation.ttcn 1 file changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/37589/1 diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index afe4217..aa620ed 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -30,8 +30,8 @@ const integer GTP1U_PORT := 2152; type record GtpEmulationCfg { - HostName gtpc_bind_ip, - PortNumber gtpc_bind_port, + HostName gtpc_bind_ip optional, + PortNumber gtpc_bind_port optional, HostName gtpu_bind_ip optional, PortNumber gtpu_bind_port optional, boolean sgsn_role @@ -213,10 +213,12 @@ private function f_init(GtpEmulationCfg cfg) runs on GTP_Emulation_CT { var Result res; - map(self:GTPC, system:GTPC); - res := GTPv1C_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, cfg.gtpc_bind_ip, - cfg.gtpc_bind_port, {udp:={}}); - g_gtpc_id := res.connId; + if (isvalue(cfg.gtpc_bind_ip) and isvalue(cfg.gtpc_bind_port)) { + map(self:GTPC, system:GTPC); + res := GTPv1C_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, cfg.gtpc_bind_ip, + cfg.gtpc_bind_port, {udp:={}}); + g_gtpc_id := res.connId; + } if (isvalue(cfg.gtpu_bind_ip) and isvalue(cfg.gtpu_bind_port)) { map(self:GTPU, system:GTPU); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37589?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: I3ffb54d0cb8b3a81ed5235feaaac6d989baf6e0d Gerrit-Change-Number: 37589 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: GTP_ConnHdlr: Allow connection to multiple GTP_Emulation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37591?usp=email ) Change subject: GTP_ConnHdlr: Allow connection to multiple GTP_Emulation ...................................................................... GTP_ConnHdlr: Allow connection to multiple GTP_Emulation This feature will be used by SGSN_Tests' BSSGP_ConnHdlr, which in 3G scenario needs to connect to GTP at both GGSN and HNBGW/RNC endpoints. Change-Id: I6fc49428967ebcf0f6c8a9f9f20f4a98a81f3273 --- M hnodeb/HNBGW_ConnectionHandler.ttcn M hnodeb/HNB_Tests.ttcn M library/GTP_Emulation.ttcn M mme/MME_Tests.ttcn M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests.ttcn 6 files changed, 93 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/37591/1 diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index e256963..a72b5f2 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -93,8 +93,8 @@ }; vc_GTP := GTP_Emulation_CT.create(id) alive; - connect(self:GTP, vc_GTP:CLIENT); - connect(self:GTP_PROC, vc_GTP:CLIENT_PROC); + connect(self:GTP[0], vc_GTP:CLIENT); + connect(self:GTP_PROC[0], vc_GTP:CLIENT_PROC); vc_GTP.start(GTP_Emulation.main(gtp_cfg)); } @@ -200,7 +200,7 @@ function f_gtpu_send(uint32_t tei, octetstring payload) runs on HNBGW_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr)); - GTP.send(ts_GTP1U_GPDU(peer, 0 /*seq*/, int2oct(tei, 4), payload)); + GTP[0].send(ts_GTP1U_GPDU(peer, 0 /*seq*/, int2oct(tei, 4), payload)); } /* HNBLLIF socket may at any time receive a new INFO.ind */ diff --git a/hnodeb/HNB_Tests.ttcn b/hnodeb/HNB_Tests.ttcn index 29f0bbb..ca36ad7 100644 --- a/hnodeb/HNB_Tests.ttcn +++ b/hnodeb/HNB_Tests.ttcn @@ -437,7 +437,7 @@ /* Forward GTP data in both directions */ LLSK.send(f_llsk_tx(ts_HNBLLIF_GTP_CONN_DATA_REQ(gtp_conn_id, gtp_payload))); - GTP.receive(tr_GTPU_GPDU(ts_GtpPeerU(g_pars.hnodeb_addr), int2oct(remote_tei, 4), gtp_payload)); + GTP[0].receive(tr_GTPU_GPDU(ts_GtpPeerU(g_pars.hnodeb_addr), int2oct(remote_tei, 4), gtp_payload)); f_gtpu_send(local_tei, gtp_payload); LLSK.receive(f_llsk_rx(tr_HNBLLIF_GTP_CONN_DATA_IND(gtp_conn_id, gtp_payload))); diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index aa620ed..c5ac029 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -316,21 +316,24 @@ /*********************************************************************** * Client Component ***********************************************************************/ +/* maximum number of GTP ports a GTP_ConnHdlr component can manage. This allows + * connection one GTP_ConnHdlr to several GTP_Emulation(s). */ +const integer NUM_MAX_GTP := 4; type component GTP_ConnHdlr { - port GTPEM_PT GTP; - port GTPEM_PROC_PT GTP_PROC; + port GTPEM_PT GTP[NUM_MAX_GTP]; + port GTPEM_PROC_PT GTP_PROC[NUM_MAX_GTP]; }; -function f_gtp_register_imsi(hexstring imsi) runs on GTP_ConnHdlr { - GTP_PROC.call(GTPEM_register_imsi:{imsi}) { - [] GTP_PROC.getreply(GTPEM_register_imsi:{imsi}); +function f_gtp_register_imsi(hexstring imsi, integer gtp_idx := 0) runs on GTP_ConnHdlr { + GTP_PROC[gtp_idx].call(GTPEM_register_imsi:{imsi}) { + [] GTP_PROC[gtp_idx].getreply(GTPEM_register_imsi:{imsi}); } } -function f_gtp_register_teid(OCT4 teid) runs on GTP_ConnHdlr { - GTP_PROC.call(GTPEM_register_teid:{teid}) { - [] GTP_PROC.getreply(GTPEM_register_teid:{teid}); +function f_gtp_register_teid(OCT4 teid, integer gtp_idx := 0) runs on GTP_ConnHdlr { + GTP_PROC[gtp_idx].call(GTPEM_register_teid:{teid}) { + [] GTP_PROC[gtp_idx].getreply(GTPEM_register_teid:{teid}); } } diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 76c9c7e..7a6b34c 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -426,8 +426,8 @@ connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC); } if (isbound(vc_GTP)) { - connect(vc_conn:GTP, vc_GTP:CLIENT); - connect(vc_conn:GTP_PROC, vc_GTP:CLIENT_PROC); + connect(vc_conn:GTP[0], vc_GTP:CLIENT); + connect(vc_conn:GTP_PROC[0], vc_GTP:CLIENT_PROC); } if (isbound(vc_GTP2)) { connect(vc_conn:GTP2, vc_GTP2:CLIENT); @@ -937,18 +937,18 @@ SGSNContextReqPDU := ts_SGSNContextReqPDU(rai, new_sgsn_local_teid, f_inet_addr(mp_gn_local_ip), ptmsi := ts_PTMSI(ptmsi), ptmsi_sig := ts_PTMSI_sig(ptmsi_sig)); - GTP.send(ts_GTPC_SGSNContextReq(g_gn_iface_peer, gtpc_seq_nr, SGSNContextReqPDU)); + GTP[0].send(ts_GTPC_SGSNContextReq(g_gn_iface_peer, gtpc_seq_nr, SGSNContextReqPDU)); timer T := 5.0; T.start; alt { - [] GTP.receive(tr_GTPC_SGSNContextResp(g_gn_iface_peer, new_sgsn_local_teid, + [] GTP[0].receive(tr_GTPC_SGSNContextResp(g_gn_iface_peer, new_sgsn_local_teid, tr_SGSNContextRespPDU(GTP_CAUSE_REQUEST_ACCEPTED, g_pars.ue_pars.imsi))) -> value gtpc_pdu { old_mme_local_teid := gtpc_pdu.gtpc.gtpc_pdu.sgsn_ContextResponse.teidControlPlane.teidControlPlane; setverdict(pass); } - [] GTP.receive { + [] GTP[0].receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("unexpected GTPC message from MME")); } [] T.timeout { @@ -956,7 +956,7 @@ } } - GTP.send(ts_GTPC_SGSNContextAck(g_gn_iface_peer, old_mme_local_teid, + GTP[0].send(ts_GTPC_SGSNContextAck(g_gn_iface_peer, old_mme_local_teid, oct2int(gtpc_pdu.gtpc.opt_part.sequenceNumber), ts_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED))); @@ -969,7 +969,7 @@ ) runs on ConnHdlr { var Gtp1cUnitdata gtpc_pdu; - [] GTP.receive(tr_GTPC_SGSNContextReq(g_gn_iface_peer, tr_SGSNContextReqPDU(rai := rai, ptmsi := ts_PTMSI(ptmsi), ptmsi_sig := ts_PTMSI_sig(ptmsi_sig), rat_type := int2oct(enum2int(rat_type), 1)))) -> value gtpc_pdu { + [] GTP[0].receive(tr_GTPC_SGSNContextReq(g_gn_iface_peer, tr_SGSNContextReqPDU(rai := rai, ptmsi := ts_PTMSI(ptmsi), ptmsi_sig := ts_PTMSI_sig(ptmsi_sig), rat_type := int2oct(enum2int(rat_type), 1)))) -> value gtpc_pdu { var template (value) PDP_Context_GTPC pdp_ctx; var template (value) GTPC_PDUs SGSNContextRespPDU; var Gtp1cUnitdata gtpc_pdu_ack; @@ -989,16 +989,16 @@ f_inet_addr(mp_gn_local_ip), ts_MM_ContextUMTS(ck, ik), { pdp_ctx }); - GTP.send(ts_GTPC_SGSNContextResp(g_gn_iface_peer, + GTP[0].send(ts_GTPC_SGSNContextResp(g_gn_iface_peer, old_mme_remote_teid, oct2int(gtpc_pdu.gtpc.opt_part.sequenceNumber), SGSNContextRespPDU)); - GTP.receive(tr_GTPC_SGSNContextAck(g_gn_iface_peer, new_sgsn_teid, + GTP[0].receive(tr_GTPC_SGSNContextAck(g_gn_iface_peer, new_sgsn_teid, tr_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED))) -> value gtpc_pdu; setverdict(pass); } - [] GTP.receive { + [] GTP[0].receive { setverdict(fail, "unexpected GTPC message from MME"); } } @@ -1078,13 +1078,13 @@ f_init_handler(pars); f_gtp_register_teid('00000000'O); - GTP.send(ts_GTPC_PING(g_gn_iface_peer, 1)); + GTP[0].send(ts_GTPC_PING(g_gn_iface_peer, 1)); T.start; alt { - [] GTP.receive(tr_GTPC_PONG(?)) { + [] GTP[0].receive(tr_GTPC_PONG(?)) { setverdict(pass); } - [] GTP.receive { + [] GTP[0].receive { setverdict(fail, "unexpected GTPC message from MME"); } [] T.timeout { @@ -1301,10 +1301,10 @@ S1AP.send(f_make_ts_S1AP_eNBDirectInfTrans(geran_gtp_ci)); T.start; alt { - [] GTP.receive(f_make_tr_GTPC_MsgType(geran_gtp_ci)) -> value req_gtpc_pdu { + [] GTP[0].receive(f_make_tr_GTPC_MsgType(geran_gtp_ci)) -> value req_gtpc_pdu { setverdict(pass); } - [] GTP.receive { + [] GTP[0].receive { setverdict(fail, "unexpected GTPC message from MME"); } [] T.timeout { @@ -1316,7 +1316,7 @@ * (SGSN -> MME -> eNB) */ f_create_s1ap_expect_proc(id_MMEDirectInformationTransfer, self); resp_gtpc_pdu := valueof(f_make_ts_GTPC_RANInfoRelay(req_gtpc_pdu, geran_gtp_ci, geran_si)); - GTP.send(resp_gtpc_pdu); + GTP[0].send(resp_gtpc_pdu); T.start; alt { [] S1AP.receive(f_make_tr_S1AP_MMEDirectInfTrans(resp_gtpc_pdu)) { diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index eb1416d..5847ac0 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -49,6 +49,9 @@ const integer NUM_GB := 3; type record length(NUM_GB) of BssgpCellId BssgpCellIds; +/* Emulated GGSN is at GTP_ConnHdlr.GTP[0] */ +const integer GTP_GGSN_IDX := 0; + type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr, RAN_ConnHdlr { var BSSGP_ConnHdlrPars g_pars; timer g_Tguard; @@ -647,10 +650,10 @@ f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco), ran_index); - GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { f_process_gtp_ctx_act_req(apars, g_ud.gtpc); var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - GTP.send(ts_GTPC_CreatePdpResp(g_ud.peer, seq_nr, + GTP[GTP_GGSN_IDX].send(ts_GTPC_CreatePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, apars.gtp_resp_cause, apars.ggsn_tei_c, apars.ggsn_tei_u, apars.nsapi, @@ -686,10 +689,10 @@ var Gtp1cUnitdata g_ud; f_send_l3(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit), ran_index); - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); BSSGP[ran_index].clear; - GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } alt { [] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)) { @@ -707,10 +710,10 @@ BSSGP[ran_index].clear; if (error_ind) { var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_c)); - GTP.send(ts_GTPU_ErrorIndication(peer, 0 /* seq */, apars.ggsn_tei_u, apars.ggsn_ip_u)); + GTP[GTP_GGSN_IDX].send(ts_GTPU_ErrorIndication(peer, 0 /* seq */, apars.ggsn_tei_u, apars.ggsn_ip_u)); } else { var Gtp1cPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); - GTP.send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); } timer T := 5.0; @@ -720,7 +723,7 @@ [] BSSGP[ran_index].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), ran_index); } - [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { + [not error_ind] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { repeat; } [] T.timeout { @@ -818,7 +821,7 @@ function f_gtpu_send(inout PdpActPars apars, octetstring payload) runs on BSSGP_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); - GTP.send(ts_GTP1U_GPDU(peer, 0 /*seq*/, apars.sgsn_tei_u, payload)); + GTP[GTP_GGSN_IDX].send(ts_GTP1U_GPDU(peer, 0 /*seq*/, apars.sgsn_tei_u, payload)); } altstep as_xid(PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { @@ -893,7 +896,7 @@ BSSGP[ran_index].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, n_u)); /* Expect PDU via GTP from SGSN on simulated GGSN */ alt { - [] GTP.receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)); + [] GTP[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)); } } diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 9b9831a..8274d43 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -469,8 +469,8 @@ connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); - connect(vc_conn:GTP, vc_GGSN_GTP:CLIENT); - connect(vc_conn:GTP_PROC, vc_GGSN_GTP:CLIENT_PROC); + connect(vc_conn:GTP[GTP_GGSN_IDX], vc_GGSN_GTP:CLIENT); + connect(vc_conn:GTP_PROC[GTP_GGSN_IDX], vc_GGSN_GTP:CLIENT_PROC); vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; @@ -1001,7 +1001,7 @@ [] BSSGP[0].receive(tr_GMM_DET_REQ_MT(?, ?)) { setverdict(pass); } - [] GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) { setverdict(fail, "Unexpected GTP PDP CTX ACT"); mtc.stop; } @@ -1119,10 +1119,10 @@ f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause_regular_deact, false, omit), 0); for (i := 0; i < 2; i := i+1) { - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); log("Received deletePDPContextResponse " & int2str(i) & ", seq_nr=" & int2str(seq_nr)); - GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } } @@ -1186,10 +1186,10 @@ f_pdp_ctx_act(apars); /* Wait to receive first echo request and send initial Restart counter */ - GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { BSSGP[0].clear; seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - GTP.send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); f_sleep(int2float(mp_echo_interval)); /* wait until around next echo is expected */ } @@ -1202,14 +1202,14 @@ f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } - [] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { /* SGSN currently doesn't send this message because it expects GGSN to be non-reachable anyway */ seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); log("Received deletePDPContextRequest seq_nr=" & int2str(seq_nr)); - GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); repeat; } - [] GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); log("Received EchoRequest seq_nr=" & int2str(seq_nr)); repeat; @@ -1244,17 +1244,17 @@ /* Activate a pdp context against the GGSN */ f_pdp_ctx_act(apars); /* Wait to receive first echo request and send initial Restart counter */ - GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - GTP.send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); } /* Wait to receive second echo request and send incremented Restart counter. This will fake a restarted GGSN, and pdp ctx allocated should be released by SGSN */ apars.ggsn_restart_ctr := int2oct(oct2int(apars.ggsn_restart_ctr) + 1, 1); - GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - GTP.send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_PONG(g_ud.peer, seq_nr, apars.ggsn_restart_ctr)); } var OCT1 cause_network_failure := int2oct(38, 1) alt { @@ -1330,7 +1330,7 @@ BSSGP[0].clear; peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); - GTP.send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); for (i := 0; i < 5; i := i+1) { alt { @@ -1339,7 +1339,7 @@ } } - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {} + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {} f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); @@ -1364,16 +1364,16 @@ f_send_l3_gmm_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco), 0); - GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud_first {} + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud_first {} log("First createPDPContextRequest received, dropping & waiting for retransmission"); - GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud_second { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud_second { if (g_ud_first != g_ud_second) { setverdict(fail, "Retransmitted GTP message createPDPContextRequest is different from original one!"); mtc.stop; } f_process_gtp_ctx_act_req(apars, g_ud_second.gtpc); var integer seq_nr := oct2int(g_ud_second.gtpc.opt_part.sequenceNumber); - GTP.send(ts_GTPC_CreatePdpResp(g_ud_second.peer, seq_nr, + GTP[GTP_GGSN_IDX].send(ts_GTPC_CreatePdpResp(g_ud_second.peer, seq_nr, apars.sgsn_tei_c, apars.gtp_resp_cause, apars.ggsn_tei_c, apars.ggsn_tei_u, apars.nsapi, @@ -1384,16 +1384,16 @@ /* Now the same with Deact */ f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, '00'O, false, omit), 0); - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud_first {} + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud_first {} log("First deletePDPContextRequest received, dropping & waiting for retransmission"); - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud_second { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud_second { if (g_ud_first != g_ud_second) { setverdict(fail, "Retransmitted GTP message deletePDPContextRequest is different from original one!"); mtc.stop; } var integer seq_nr := oct2int(g_ud_second.gtpc.opt_part.sequenceNumber); BSSGP[0].clear; - GTP.send(ts_GTPC_DeletePdpResp(g_ud_second.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_DeletePdpResp(g_ud_second.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } alt { [] BSSGP[0].receive(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid)) { @@ -1426,14 +1426,14 @@ BSSGP[0].clear; var Gtp1cPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); g_delete_req := ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B); - GTP.send(g_delete_req); + GTP[GTP_GGSN_IDX].send(g_delete_req); alt { [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) { f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), 0); } [] as_xid(apars, 0); } - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) -> value g_ud_first { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) -> value g_ud_first { if (g_ud_first.gtpc.gtpc_pdu.deletePDPContextResponse.cause.causevalue != '80'O) { setverdict(fail, "Received deletePDPContextResponse cause is not 'Request accepted'"); mtc.stop; @@ -1442,8 +1442,8 @@ /* Send duplicate DeleteCtxReq */ log("First deletePDPContextResponse received, dropping & retransmitting retransmission of deletePDPContextRequest"); - GTP.send(g_delete_req); - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) -> value g_ud_second { + GTP[GTP_GGSN_IDX].send(g_delete_req); + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) -> value g_ud_second { if (g_ud_first != g_ud_second) { setverdict(fail, "Retransmitted GTP message deletePDPContextResponse is different from original one!"); mtc.stop; @@ -1453,9 +1453,9 @@ /* Let's send now a new DeleteCtxReq (increased seq_nr) to make sure it * is handled differently by SGSN (expect "non-existent" cause) */ g_delete_req := ts_GTPC_DeletePDP(peer, seq_nr + 1, apars.sgsn_tei_c, apars.nsapi, '1'B); - GTP.send(g_delete_req); + GTP[GTP_GGSN_IDX].send(g_delete_req); /* Response with cause "non-existent" must be sent with TEID 0 according to specs */ - GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, '00000000'O)) -> value g_ud_second { + GTP[GTP_GGSN_IDX].receive(tr_GTPC_MsgType(?, deletePDPContextResponse, '00000000'O)) -> value g_ud_second { if (g_ud_second.gtpc.gtpc_pdu.deletePDPContextResponse.cause.causevalue != 'C0'O) { setverdict(fail, "Received deletePDPContextResponse cause is not 'Non-existent'"); mtc.stop; @@ -2843,7 +2843,7 @@ timer T := 2.0; T.start; alt { - [] GTP.receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)) { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)) { setverdict(fail, "Unexpected GTP message"); } [] T.timeout { setverdict(pass); } @@ -2916,7 +2916,7 @@ sgsn_addr_control := f_inet_addr(mp_ggsn_ip), ptmsi := ts_PTMSI(g_pars.p_tmsi), ptmsi_sig := ts_PTMSI_sig('010203'O)); - GTP.send(ts_GTPC_SGSNContextReq(peer, seq_nr, ctx_req)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_SGSNContextReq(peer, seq_nr, ctx_req)); /* The SGSN responds with subscriber's IMSI */ var template (present) GTPC_PDUs ctx_rsp; @@ -2941,13 +2941,13 @@ T.start(2.0); alt { - [] GTP.receive(tr_GTPC_SGSNContextResp(?, ?, ctx_rsp)) -> value gtpc_ud { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_SGSNContextResp(?, ?, ctx_rsp)) -> value gtpc_ud { log("Rx SGSN Context Resp from SGSN, sending Ack"); - GTP.send(ts_GTPC_SGSNContextAck(gtpc_ud.peer, '12345678'O, seq_nr)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_SGSNContextAck(gtpc_ud.peer, '12345678'O, seq_nr)); setverdict(pass); } - [] GTP.receive(tr_GTPC_SGSNContextResp) -> value gtpc_ud { - GTP.send(ts_GTPC_SGSNContextAck(gtpc_ud.peer, '12345678'O, seq_nr, + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_SGSNContextResp) -> value gtpc_ud { + GTP[GTP_GGSN_IDX].send(ts_GTPC_SGSNContextAck(gtpc_ud.peer, '12345678'O, seq_nr, ts_SGSNContextAckPDU(GTP_CAUSE_INVALID_MSG_FORMAT))); setverdict(fail, "Rx unexpected SGSN Context Resp"); } @@ -2985,12 +2985,12 @@ /* The SGSN has no idea about the MS and inquires the MME about it */ T.start(2.0); alt { - [] GTP.receive(tr_GTPC_SGSNContextReq(?, ?)) -> value gtpc_ud { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_SGSNContextReq(?, ?)) -> value gtpc_ud { log("Rx SGSN Context Req from SGSN"); setverdict(pass); T.stop; } - [] GTP.receive(tr_GTPC_SGSNContextResp) { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_SGSNContextResp) { setverdict(fail, "Rx unexpected SGSN Context Req"); mtc.stop; } @@ -3023,14 +3023,14 @@ teic := '12345678'O, mm_context := ts_MM_ContextGSM(kc), pdp_ctx_list := { pdp_ctx }); - GTP.send(ts_GTPC_SGSNContextResp(gtpc_ud.peer, '12345678'O, seq_nr, ctx_rsp)); + GTP[GTP_GGSN_IDX].send(ts_GTPC_SGSNContextResp(gtpc_ud.peer, '12345678'O, seq_nr, ctx_rsp)); /* TODO: Security Functions (auth/ciphering?) */ /* The SGSN ACKs */ T.start(2.0); alt { - [] GTP.receive(tr_GTPC_SGSNContextAck) -> value gtpc_ud { + [] GTP[GTP_GGSN_IDX].receive(tr_GTPC_SGSNContextAck) -> value gtpc_ud { log("Rx SGSN Context ACK from SGSN"); setverdict(pass); T.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37591?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: I6fc49428967ebcf0f6c8a9f9f20f4a98a81f3273 Gerrit-Change-Number: 37591 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[M] Change in osmo-sgsn[master]: Bump version: 1.11.1.22-bea6a-dirty → 1.12.0

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37588?usp=email ) Change subject: Bump version: 1.11.1.22-bea6a-dirty → 1.12.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37588?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9331fb5c69c5d00d419e859f1fa81d6e231b0318 Gerrit-Change-Number: 37588 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jul 2024 16:00:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[M] Change in osmo-msc[master]: Bump version: 1.11.1.65-22d4f3-dirty → 1.12.0

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/37587?usp=email ) Change subject: Bump version: 1.11.1.65-22d4f3-dirty → 1.12.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/37587?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic6f6d893025acff60df33cbfda980100e492e1c6 Gerrit-Change-Number: 37587 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jul 2024 16:00:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[M] Change in osmo-bsc[master]: Bump version: 1.11.0.92-278b-dirty → 1.12.0

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/37585?usp=email ) Change subject: Bump version: 1.11.0.92-278b-dirty → 1.12.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/37585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I849e44757568c8c15e9994bf50211f3fb1381a41 Gerrit-Change-Number: 37585 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jul 2024 15:59:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[M] Change in osmo-sgsn[master]: Bump version: 1.11.1.22-bea6a-dirty → 1.12.0

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37588?usp=email ) Change subject: Bump version: 1.11.1.22-bea6a-dirty → 1.12.0 ...................................................................... Bump version: 1.11.1.22-bea6a-dirty → 1.12.0 Change-Id: I9331fb5c69c5d00d419e859f1fa81d6e231b0318 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control 4 files changed, 78 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/88/37588/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index df983c1..0ed7189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,2 +1,9 @@ -#component what description / commit summary line -libosmocore > 1.9.0 gsup.h: Using new fields in struct osmo_gsup_pdp_info (ABI break) \ No newline at end of file +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release +# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info… +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/configure.ac b/configure.ac index 399b466..7e318aa 100644 --- a/configure.ac +++ b/configure.ac @@ -38,23 +38,23 @@ CFLAGS="$CFLAGS -std=gnu11" dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.9.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.9.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.9.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.5.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.7.0) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.6.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.8.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.12.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.8.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.9.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.5.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.6.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") diff --git a/debian/changelog b/debian/changelog index cb629fb..a1f0216 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,43 @@ +osmo-sgsn (1.12.0) unstable; urgency=medium + + [ Andreas Eversberg ] + * Use uniform log format for default config files + + [ Vadim Yanitskiy ] + * build: include README.md into the release tarball + * gmm: cosmetic: fix preprocessor macro formatting + * gmm: mmctx_timer_stop(): warn about timer not running + * VTY: move default settings to sgsn_instance_alloc() + * VTY: sync default UMTS UEA config with osmo-msc + * README.md: cosmetic: fix a typo + + [ Pau Espin Pedrol ] + * gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields + + [ Harald Welte ] + * Add funding link to github mirror + * README.md: Overhaul (more links; improved formatting) + * README.md: Add Forum and Issue Tracker sections + + [ Max ] + * .deb/.rpm: add osmocom user during package install + + [ Oliver Smith ] + * contrib/osmo-sgsn.spec: fix build for almalinux:8 + * .deb/.rpm: various fixes related to non-root + * contrib: remove rpm spec file + * debian/postinst: add checks, be verbose + * sgsn/sgsn_vty: create state-dir + * debian/osmo-gtphub.init: delete + * doc: set state-dir to /var/lib/osmocom/osmo-sgsn + + [ Alexander Couzens ] + * docs: replace legacy NS with new NS2 chapters + * docs: update year to 2024 + * docs: front page: use https:// instead of http:// + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 24 Jul 2024 17:31:38 +0200 + osmo-sgsn (1.11.1) unstable; urgency=medium [ Philipp Maier ] diff --git a/debian/control b/debian/control index aa59455..c9c224b 100644 --- a/debian/control +++ b/debian/control @@ -11,16 +11,16 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.11.0), - libosmocore-dev (>= 1.9.0), - libosmo-abis-dev (>= 1.5.0), - libosmo-netif-dev (>= 1.4.0), - libosmo-gsup-client-dev (>= 1.7.0), + libgtp-dev (>= 1.12.0), + libosmocore-dev (>= 1.10.0), + libosmo-abis-dev (>= 1.6.0), + libosmo-netif-dev (>= 1.5.0), + libosmo-gsup-client-dev (>= 1.8.0), libasn1c-dev (>= 0.9.30), - libosmo-ranap-dev (>= 1.5.0), - libosmo-sigtran-dev (>= 1.8.0), - libosmo-sccp-dev (>= 1.8.0), - osmo-gsm-manuals-dev (>= 1.5.0) + libosmo-ranap-dev (>= 1.6.0), + libosmo-sigtran-dev (>= 1.9.0), + libosmo-sccp-dev (>= 1.9.0), + osmo-gsm-manuals-dev (>= 1.6.0) Standards-Version: 3.9.8 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-sgsn Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-sgsn -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37588?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9331fb5c69c5d00d419e859f1fa81d6e231b0318 Gerrit-Change-Number: 37588 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024