February 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_modify_req_rsp[_multi]

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39077?usp=email ) Change subject: s1gw: add TC_e_rab_modify_req_rsp[_multi] ...................................................................... s1gw: add TC_e_rab_modify_req_rsp[_multi] Test the E-RAB Modify procedure (MME initiated), which is defined in 3GPP TS 36.413 section 8.2.2. Change-Id: I58b9964bae24b5aac526ee0c0c8ac8798f351e05 Related: osmo-s1gw.git I24d57ea390d71b640cb42046a8658e9d30670682 Related: osmo-s1gw.git I057a1c58d0c6ad04c00ad3ea4c68230d8632a07e Related: SYS#7308 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 3 files changed, 210 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 3f79e47..f5ff588 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -280,6 +280,9 @@ setverdict(pass); } +type integer ERabIdx (0..255); +type record of ERabIdx ERabIdxList; + /* 256 is maxnoofE-RABs (see S1AP_Constants.asn) */ type record length(1..256) of ERab ERabList; type record ERab { @@ -288,6 +291,7 @@ ERabParams c2u, /* Core -> UPF params */ ERabParams a2u, /* Access -> UPF params */ ERabParams u2a, /* UPF -> Access params */ + ERabParams u2cm, /* UPF -> Core params (modified) */ OCT8 pfcp_loc_seid, OCT8 pfcp_rem_seid optional }; @@ -407,6 +411,133 @@ return pdu; } +function f_ConnHdlr_tx_erab_modify_req(in ERabList erabs, + boolean transport_info := true) +runs on ConnHdlr { + var template (value) E_RABToBeModifiedListBearerModReq items; + var template (value) E_RABLevelQoSParameters qos_params; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + qos_params := valueof(ts_E_RABLevelQoSParameters); + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABToBeModifiedItemBearerModReq item; + + if (transport_info) { + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2cm; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_E_RABToBeModifiedItemBearerModReqExt(rab_id := erabs[i].erab_id, + qos_params := qos_params, + nas_pdu := ''O, + tla := tla, + gtp_teid := epars.teid); + } else { + item := ts_E_RABToBeModifiedItemBearerModReq(rab_id := erabs[i].erab_id, + qos_params := qos_params, + nas_pdu := ''O); + } + + items[i] := ts_E_RABToBeModifiedListBearerModReq(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABModifyReq(g_pars.mme_ue_id, enb_ue_id, + rab_modify_items := items)); +} + +function f_ConnHdlr_rx_erab_modify_req(in ERabList erabs, + boolean transport_info := true) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABToBeModifiedListBearerModReq items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABToBeModifiedItemBearerModReq item; + + if (transport_info) { + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].a2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_E_RABToBeModifiedItemBearerModReqExt(rab_id := erabs[i].erab_id, + qos_params := ?, + nas_pdu := ''O, + tla := tla, + gtp_teid := epars.teid); + } else { + item := tr_E_RABToBeModifiedItemBearerModReq(rab_id := erabs[i].erab_id, + qos_params := ?, + nas_pdu := ''O); + } + + items[i] := tr_E_RABToBeModifiedListBearerModReq(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABModifyReq(g_pars.mme_ue_id, enb_ue_id, + rab_modify_items := items)); + return pdu; +} + +function f_ConnHdlr_tx_erab_modify_rsp(in ERabIdxList erabs_modified, + in ERabIdxList erabs_failed := {}) +runs on ConnHdlr { + var template (value) E_RABModifyListBearerModRes items_modified; + var template (omit) E_RABList items_failed := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (value) E_RABModifyItemBearerModRes item; + var ERabIdx idx := erabs_modified[i]; + + item := ts_E_RABModifyItemBearerModRes(g_pars.erabs[idx].erab_id); + items_modified[i] := ts_E_RABModifyListBearerModRes(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_failed); i := i + 1) { + var template (value) E_RABItem item; + var ERabIdx idx := erabs_failed[i]; + + item := ts_E_RABItem(g_pars.erabs[idx].erab_id); + items_failed[i] := ts_E_RABList(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABModifyRsp(g_pars.mme_ue_id, enb_ue_id, + rab_modified_items := items_modified, + rab_failed_items := items_failed)); +} + +function f_ConnHdlr_rx_erab_modify_rsp(in ERabIdxList erabs_modified, + in ERabIdxList erabs_failed := {}) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABModifyListBearerModRes items_modified; + var template E_RABList items_failed := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (present) E_RABModifyItemBearerModRes item; + var ERabIdx idx := erabs_modified[i]; + + item := tr_E_RABModifyItemBearerModRes(g_pars.erabs[idx].erab_id); + items_modified[i] := tr_E_RABModifyListBearerModRes(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_failed); i := i + 1) { + var template (present) E_RABItem item; + var ERabIdx idx := erabs_failed[i]; + + item := tr_E_RABItem(g_pars.erabs[idx].erab_id); + items_failed[i] := tr_E_RABList(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABModifyRsp(g_pars.mme_ue_id, enb_ue_id, + rab_modified_items := items_modified, + rab_failed_items := items_failed)); + return pdu; +} + private function f_ts_E_RABList(in ERabList erabs, S1AP_IEs.Cause cause) return template (value) E_RABList { @@ -822,6 +953,49 @@ f_ConnHdlr_rx_erab_setup_rsp(erabs); } +function f_ConnHdlr_erab_modify_req(in ERabList erabs) +runs on ConnHdlr { + log("eNB <- [S1GW <- MME]: E-RAB MODIFY REQUEST"); + f_ConnHdlr_tx_erab_modify_req(erabs); + /* Expect the S1GW to modify FARs (id=2) of the respective PFCP sessions */ + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erabs[i].u2cm, + seid := erabs[i].pfcp_loc_seid, + far_id := c_PFCP_FAR_ID_A2C); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); + f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); + } + log("[eNB <- S1GW] <- MME: E-RAB MODIFY REQUEST"); + f_ConnHdlr_rx_erab_modify_req(erabs); +} + +function f_ConnHdlr_erab_modify_rsp(in ERabIdxList erabs_modified, + in ERabIdxList erabs_failed) +runs on ConnHdlr { + log("[eNB -> S1GW] -> MME: E-RAB MODIFY RESPONSE"); + f_ConnHdlr_tx_erab_modify_rsp(erabs_modified, erabs_failed); + /* For successfully modified E-RABs, U2CM becomes U2C */ + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var ERabIdx idx := erabs_modified[i]; + g_pars.erabs[idx].u2c := g_pars.erabs[idx].u2cm; + } + /* Expect the S1GW to modify (revert) FARs (id=2) for failed E-RABs */ + for (var integer i := 0; i < lengthof(erabs_failed); i := i + 1) { + var ERabIdx idx := erabs_failed[i]; + var ERab erab := g_pars.erabs[idx]; + + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erab.erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erab.u2c, + seid := erab.pfcp_loc_seid, + far_id := c_PFCP_FAR_ID_A2C); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erab.erab_id); + f_ConnHdlr_tx_session_modify_resp(erab, pdu); + } + log("eNB -> [S1GW -> MME]: E-RAB MODIFY RESPONSE"); + f_ConnHdlr_rx_erab_modify_rsp(erabs_modified, erabs_failed); +} + function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 8bb2f09..2533fd6 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -158,6 +158,7 @@ c2u := {'0101'O & uid, "127.0.1.1"}, a2u := {'0202'O & uid, "127.0.2.2"}, u2a := {'0002'O & uid, "127.0.0.2"}, + u2cm := {'0011'O & uid, "127.127.0.1"}, pfcp_loc_seid := seid_prefix & uid, pfcp_rem_seid := omit /* assigned by S1GW */ }; @@ -403,6 +404,36 @@ f_TC_exec(refers(f_TC_e_rab_setup_failure)); } +/* Test E-RAB MODIFY Req/Rsp procedure */ +function f_TC_e_rab_modify_req_rsp(charstring id) runs on ConnHdlr { + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + + f_ConnHdlr_erab_setup_req(g_pars.erabs); + f_ConnHdlr_erab_setup_rsp(g_pars.erabs); + + /* MME orders eNB to modify all 4 E-RABs */ + f_ConnHdlr_erab_modify_req(g_pars.erabs); + /* eNB modifies E-RABs 1 and 3, but not E-RAB 0 and 2 */ + f_ConnHdlr_erab_modify_rsp(erabs_modified := {1, 3}, + erabs_failed := {0, 2}); + + f_ConnHdlr_erab_release_cmd(g_pars.erabs); + f_ConnHdlr_erab_release_rsp(g_pars.erabs); + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} +/* 4 E-RABs at a time, single eNB */ +testcase TC_e_rab_modify_req_rsp() runs on test_CT { + f_TC_exec(refers(f_TC_e_rab_modify_req_rsp), 1, 4); +} +/* 4 E-RABs at a time, multiple eNB connections */ +testcase TC_e_rab_modify_req_rsp_multi() runs on test_CT { + f_TC_exec(refers(f_TC_e_rab_modify_req_rsp), mp_multi_enb_num, 4); +} + /* Test INITIAL CONTEXT SETUP procedure (successful case) */ function f_TC_initial_ctx_setup(charstring id) runs on ConnHdlr { f_ConnHdlr_s1ap_register(g_pars.genb_id); @@ -538,6 +569,8 @@ execute( TC_e_rab_setup3_multi() ); execute( TC_e_rab_release_ind() ); execute( TC_e_rab_setup_failure() ); + execute( TC_e_rab_modify_req_rsp() ); + execute( TC_e_rab_modify_req_rsp_multi() ); execute( TC_initial_ctx_setup() ); execute( TC_initial_ctx_setup3() ); execute( TC_initial_ctx_setup_multi() ); diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index c5cb28f..a4e6e02 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='20' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='22' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> @@ -10,6 +10,8 @@ <testcase classname='S1GW_Tests' name='TC_e_rab_setup3_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_release_ind' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_setup_failure' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_modify_req_rsp' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_modify_req_rsp_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup_multi' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39077?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I58b9964bae24b5aac526ee0c0c8ac8798f351e05 Gerrit-Change-Number: 39077 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_modify_ind_cnf[_multi]

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39145?usp=email ) Change subject: s1gw: add TC_e_rab_modify_ind_cnf[_multi] ...................................................................... s1gw: add TC_e_rab_modify_ind_cnf[_multi] Test the E-RAB Modify procedure (eNB initiated), which is defined in 3GPP TS 36.413 section 8.2.4. Change-Id: Iec95ca0ecf37290bddfbefce1861f8ae66bf4db1 Related: osmo-s1gw.git I750ada0a5a21edc8bc06d567c8000b6304966474 Related: osmo-s1gw.git Icc16a57d40b68bd17c5d207b643927d58176e088 Related: SYS#7308 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 3 files changed, 258 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_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index f5ff588..3414315 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -292,6 +292,7 @@ ERabParams a2u, /* Access -> UPF params */ ERabParams u2a, /* UPF -> Access params */ ERabParams u2cm, /* UPF -> Core params (modified) */ + ERabParams u2am, /* UPF -> Access params (modified) */ OCT8 pfcp_loc_seid, OCT8 pfcp_rem_seid optional }; @@ -538,6 +539,164 @@ return pdu; } +function f_ConnHdlr_tx_erab_modify_ind(in ERabIdxList erabs_modified, + in ERabIdxList erabs_not_modified := {}) +runs on ConnHdlr { + var template (value) E_RABToBeModifiedListBearerModInd items_modified; + var template (omit) E_RABNotToBeModifiedListBearerModInd items_not_modified := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (value) E_RABToBeModifiedItemBearerModInd item; + var ERabIdx idx := erabs_modified[i]; + var ERabParams epars := g_pars.erabs[idx].u2am; + + item := ts_E_RABToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_modified[i] := ts_E_RABToBeModifiedListBearerModInd(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (value) E_RABNotToBeModifiedItemBearerModInd item; + var ERabIdx idx := erabs_not_modified[i]; + var ERabParams epars := g_pars.erabs[idx].u2a; + + item := ts_E_RABNotToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_not_modified[i] := ts_E_RABNotToBeModifiedListBearerModInd(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABModifyInd(g_pars.mme_ue_id, enb_ue_id, + rab_do_modify_items := items_modified, + rab_no_modify_items := items_not_modified)); +} + +function f_ConnHdlr_rx_erab_modify_ind(in ERabIdxList erabs_modified, + in ERabIdxList erabs_not_modified := {}) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABToBeModifiedListBearerModInd items_modified; + var template E_RABNotToBeModifiedListBearerModInd items_not_modified := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (present) E_RABToBeModifiedItemBearerModInd item; + var ERabIdx idx := erabs_modified[i]; + var ERabParams epars := g_pars.erabs[idx].c2u; + + item := tr_E_RABToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_modified[i] := tr_E_RABToBeModifiedListBearerModInd(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (present) E_RABNotToBeModifiedItemBearerModInd item; + var ERabIdx idx := erabs_not_modified[i]; + var ERabParams epars := g_pars.erabs[idx].c2u; + + item := tr_E_RABNotToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_not_modified[i] := tr_E_RABNotToBeModifiedListBearerModInd(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABModifyInd(g_pars.mme_ue_id, enb_ue_id, + rab_do_modify_items := items_modified, + rab_no_modify_items := items_not_modified)); + return pdu; +} + +function f_ConnHdlr_tx_erab_modify_cnf(in ERabIdxList erabs_modified := {}, + in ERabIdxList erabs_not_modified := {}, + in ERabIdxList erabs_release := {}) +runs on ConnHdlr { + var template (omit) E_RABModifyListBearerModConf items_modified := omit; + var template (omit) E_RABList items_not_modified := omit; + var template (omit) E_RABList items_release := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (value) E_RABModifyItemBearerModConf item; + var ERabIdx idx := erabs_modified[i]; + + item := ts_E_RABModifyItemBearerModConf(rab_id := g_pars.erabs[idx].erab_id); + items_modified[i] := ts_E_RABModifyListBearerModConf(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (value) E_RABItem item; + var ERabIdx idx := erabs_not_modified[i]; + + item := ts_E_RABItem(rab_id := g_pars.erabs[idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_not_modified[i] := ts_E_RABList(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_release); i := i + 1) { + var template (value) E_RABItem item; + var ERabIdx idx := erabs_release[i]; + + item := ts_E_RABItem(rab_id := g_pars.erabs[idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_release[i] := ts_E_RABList(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABModifyCnf(g_pars.mme_ue_id, enb_ue_id, + rab_modified_items := items_modified, + rab_failed_items := items_not_modified, + rab_release_items := items_release)); +} + +function f_ConnHdlr_rx_erab_modify_cnf(in ERabIdxList erabs_modified := {}, + in ERabIdxList erabs_not_modified := {}, + in ERabIdxList erabs_release := {}) +runs on ConnHdlr return S1AP_PDU { + var template E_RABModifyListBearerModConf items_modified := omit; + var template E_RABList items_not_modified := omit; + var template E_RABList items_release := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (present) E_RABModifyItemBearerModConf item; + var ERabIdx idx := erabs_modified[i]; + + item := tr_E_RABModifyItemBearerModConf(rab_id := g_pars.erabs[idx].erab_id); + items_modified[i] := tr_E_RABModifyListBearerModConf(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (present) E_RABItem item; + var ERabIdx idx := erabs_not_modified[i]; + + item := tr_E_RABItem(rab_id := g_pars.erabs[idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_not_modified[i] := tr_E_RABList(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_release); i := i + 1) { + var template (present) E_RABItem item; + var ERabIdx idx := erabs_release[i]; + + item := tr_E_RABItem(rab_id := g_pars.erabs[idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_release[i] := tr_E_RABList(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABModifyCnf(g_pars.mme_ue_id, enb_ue_id, + rab_modified_items := items_modified, + rab_failed_items := items_not_modified, + rab_release_items := items_release)); + return pdu; +} + private function f_ts_E_RABList(in ERabList erabs, S1AP_IEs.Cause cause) return template (value) E_RABList { @@ -996,6 +1155,64 @@ f_ConnHdlr_rx_erab_modify_rsp(erabs_modified, erabs_failed); } +function f_ConnHdlr_erab_modify_ind(in ERabIdxList erabs_modified, + in ERabIdxList erabs_not_modified := {}) +runs on ConnHdlr { + log("[eNB -> S1GW] -> MME: E-RAB MODIFICATION INDICATION"); + f_ConnHdlr_tx_erab_modify_ind(erabs_modified, erabs_not_modified); + /* Expect the S1GW to modify FARs (id=1) of the respective PFCP sessions */ + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var ERabIdx idx := erabs_modified[i]; + var ERab erab := g_pars.erabs[idx]; + + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erab.erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erab.u2am, + seid := erab.pfcp_loc_seid, + far_id := c_PFCP_FAR_ID_C2A); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erab.erab_id); + f_ConnHdlr_tx_session_modify_resp(erab, pdu); + } + log("eNB -> [S1GW -> MME]: E-RAB MODIFICATION INDICATION"); + f_ConnHdlr_rx_erab_modify_ind(erabs_modified, erabs_not_modified); +} + +function f_ConnHdlr_erab_modify_cnf(in ERabIdxList erabs_modified := {}, + in ERabIdxList erabs_not_modified := {}, + in ERabIdxList erabs_release := {}) +runs on ConnHdlr { + log("eNB <- [S1GW <- MME]: E-RAB MODIFICATION CONFIRMATION"); + f_ConnHdlr_tx_erab_modify_cnf(erabs_modified, erabs_not_modified, erabs_release); + /* For successfully modified E-RABs, U2AM becomes U2A */ + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var ERabIdx idx := erabs_modified[i]; + g_pars.erabs[idx].u2a := g_pars.erabs[idx].u2am; + } + /* Expect the S1GW to modify (revert) FARs (id=1) for failed E-RABs (if any) */ + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var ERabIdx idx := erabs_not_modified[i]; + var ERab erab := g_pars.erabs[idx]; + + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erab.erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erab.u2a, + seid := erab.pfcp_loc_seid, + far_id := c_PFCP_FAR_ID_C2A); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erab.erab_id); + f_ConnHdlr_tx_session_modify_resp(erab, pdu); + } + /* Expect the S1GW to delete sessions for released E-RABs (if any) */ + if (lengthof(erabs_release) > 0) { + var ERabList erabs; + + for (var integer i := 0; i < lengthof(erabs_release); i := i + 1) { + var ERabIdx idx := erabs_release[i]; + erabs[i] := g_pars.erabs[idx]; + } + f_ConnHdlr_session_delete(erabs); + } + log("[eNB <- S1GW] <- MME: E-RAB MODIFICATION CONFIRMATION"); + f_ConnHdlr_rx_erab_modify_cnf(erabs_modified, erabs_not_modified, erabs_release); +} + function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 2533fd6..e722a10 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -159,6 +159,7 @@ a2u := {'0202'O & uid, "127.0.2.2"}, u2a := {'0002'O & uid, "127.0.0.2"}, u2cm := {'0011'O & uid, "127.127.0.1"}, + u2am := {'0022'O & uid, "127.127.0.2"}, pfcp_loc_seid := seid_prefix & uid, pfcp_rem_seid := omit /* assigned by S1GW */ }; @@ -434,6 +435,41 @@ f_TC_exec(refers(f_TC_e_rab_modify_req_rsp), mp_multi_enb_num, 4); } +/* Test E-RAB MODIFICATION Ind/Cnf procedure */ +function f_TC_e_rab_modify_ind_cnf(charstring id) runs on ConnHdlr { + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + + f_ConnHdlr_erab_setup_req(g_pars.erabs); + f_ConnHdlr_erab_setup_rsp(g_pars.erabs); + + /* eNB wants to modify all E-RABs but E-RAB 4 */ + f_ConnHdlr_erab_modify_ind(erabs_modified := {0, 1, 2, 3}, + erabs_not_modified := {4}); + /* MME modifies E-RABs 1 and 3, but not E-RAB 0 and 2 */ + f_ConnHdlr_erab_modify_cnf(erabs_modified := {1, 3}, + erabs_not_modified := {0, 2}); + + /* For the sake of fun, test forwarding of an empty confirmation, + * which is expected to be forwarded unmodified */ + f_ConnHdlr_erab_modify_cnf(); + + f_ConnHdlr_erab_release_cmd(g_pars.erabs); + f_ConnHdlr_erab_release_rsp(g_pars.erabs); + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} +/* 5 E-RABs at a time, single eNB */ +testcase TC_e_rab_modify_ind_cnf() runs on test_CT { + f_TC_exec(refers(f_TC_e_rab_modify_ind_cnf), 1, 5); +} +/* 5 E-RABs at a time, multiple eNB connections */ +testcase TC_e_rab_modify_ind_cnf_multi() runs on test_CT { + f_TC_exec(refers(f_TC_e_rab_modify_ind_cnf), mp_multi_enb_num, 5); +} + /* Test INITIAL CONTEXT SETUP procedure (successful case) */ function f_TC_initial_ctx_setup(charstring id) runs on ConnHdlr { f_ConnHdlr_s1ap_register(g_pars.genb_id); @@ -571,6 +607,8 @@ execute( TC_e_rab_setup_failure() ); execute( TC_e_rab_modify_req_rsp() ); execute( TC_e_rab_modify_req_rsp_multi() ); + execute( TC_e_rab_modify_ind_cnf() ); + execute( TC_e_rab_modify_ind_cnf_multi() ); execute( TC_initial_ctx_setup() ); execute( TC_initial_ctx_setup3() ); execute( TC_initial_ctx_setup_multi() ); diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index a4e6e02..74936f5 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='22' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='24' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> @@ -12,6 +12,8 @@ <testcase classname='S1GW_Tests' name='TC_e_rab_setup_failure' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_modify_req_rsp' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_modify_req_rsp_multi' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_modify_ind_cnf' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_modify_ind_cnf_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup_multi' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec95ca0ecf37290bddfbefce1861f8ae66bf4db1 Gerrit-Change-Number: 39145 Gerrit-PatchSet: 7 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>

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: sgsn: remove osmo-sgsn <= 1.12.0 code path

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39551?usp=email ) Change subject: sgsn: remove osmo-sgsn <= 1.12.0 code path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39551?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4ead7b05d7d956303584ccbfe1e13692f54341af Gerrit-Change-Number: 39551 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Feb 2025 16:48:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: remove osmo-hnbgw <= 1.6.0 code path

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39550?usp=email ) Change subject: hnbgw: remove osmo-hnbgw <= 1.6.0 code path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39550?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie55b752c19aa597afdc47b6e57e8ff0b42313e00 Gerrit-Change-Number: 39550 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Feb 2025 16:48:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: sgsn: remove osmo-sgsn <= 1.12.0 code path

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39551?usp=email ) Change subject: sgsn: remove osmo-sgsn <= 1.12.0 code path ...................................................................... sgsn: remove osmo-sgsn <= 1.12.0 code path Now that 1.13.0 has been released, we can run this test in latest too. Change-Id: I4ead7b05d7d956303584ccbfe1e13692f54341af --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39551/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 62856ff..b2d9731 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -3232,10 +3232,7 @@ execute( TC_attach_rau() ); execute( TC_attach_rau_a_a() ); execute( TC_attach_rau_a_b() ); - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - /* Will double-free and crash osmo-sgsn <= 1.12.0 */ - execute( TC_attach_rau_a_b_wrong_old_ra() ); - } + execute( TC_attach_rau_a_b_wrong_old_ra() ); execute( TC_attach_usim_resync() ); execute( TC_attach_usim_a54_a54() ); execute( TC_attach_usim_a54_a53() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39551?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4ead7b05d7d956303584ccbfe1e13692f54341af Gerrit-Change-Number: 39551 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: remove osmo-hnbgw <= 1.6.0 code path

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39550?usp=email ) Change subject: hnbgw: remove osmo-hnbgw <= 1.6.0 code path ...................................................................... hnbgw: remove osmo-hnbgw <= 1.6.0 code path osmo-hnbgw 1.7.0 has been released, so we can remove this code path. Change-Id: Ie55b752c19aa597afdc47b6e57e8ff0b42313e00 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 2 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/39550/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 589c699..33800f3 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -381,19 +381,10 @@ /* Temporarily access Statsd during test startup: */ connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); - /* osmo-hnbgw <= 1.6.0 doesn't support the stats "pfcp_associated". - * Assume we have to wait for IUT to send PFCP Assoc Setup Req, - * but avoid failing if we don't receive any. */ - var boolean validate_pfcp_assoc := Misc_Helpers.f_osmo_repo_is("nightly"); - var boolean pfcp_associated := false; - if (validate_pfcp_assoc) { - pfcp_associated := f_statsd_pfcp_associated(); - } - - if (not pfcp_associated) { + if (not f_statsd_pfcp_associated()) { connect(self:PFCP, vc_PFCP:CLIENT); connect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC); - f_pfcp_wait_assoc_setup_req(fail_timeout := validate_pfcp_assoc); + f_pfcp_wait_assoc_setup_req(fail_timeout := true); disconnect(self:PFCP, vc_PFCP:CLIENT); disconnect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39550?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie55b752c19aa597afdc47b6e57e8ff0b42313e00 Gerrit-Change-Number: 39550 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-sgsn[pespin/base]: GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39544?usp=email ) Change subject: GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known ...................................................................... GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known The IE is optional, but if it is present, it must be 11 byte long containing a 8 byte IMEISV. If IMEI is unknown the SGSN would add an empty IMEISV IE which is invalid. Change-Id: I812af1e702e77214244f32ae65663c1a03b23962 (cherry picked from commit 7d94476bde47cd9803f410ec2ffd072213e9ab48) --- M src/sgsn/sgsn_libgtp.c 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index faf0e7f..385b843 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -299,11 +299,14 @@ break; } - /* include the IMEI(SV) */ - pdp->imeisv_given = 1; - gsm48_encode_bcd_number(&pdp->imeisv.v[0], 8, 0, mmctx->imei); - pdp->imeisv.l = pdp->imeisv.v[0]; - memmove(&pdp->imeisv.v[0], &pdp->imeisv.v[1], 8); + /* optional include the IMEI(SV) */ + if (mmctx->imei[0] != '\0') { + memset(&pdp->imeisv.v[0], 0, 8); + pdp->imeisv_given = 1; + gsm48_encode_bcd_number(&pdp->imeisv.v[0], 8, 0, mmctx->imei); + pdp->imeisv.l = 8; + memmove(&pdp->imeisv.v[0], &pdp->imeisv.v[1], 8); + } /* change pdp state to 'requested' */ pctx->state = PDP_STATE_CR_REQ; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: I812af1e702e77214244f32ae65663c1a03b23962 Gerrit-Change-Number: 39544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu>

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-sgsn[pespin/base]: jenkins.sh: libosmo-netif no longer depends on libosmo-abis

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39542?usp=email ) Change subject: jenkins.sh: libosmo-netif no longer depends on libosmo-abis ...................................................................... jenkins.sh: libosmo-netif no longer depends on libosmo-abis Change-Id: Id62040f41e9a5c233cc42eedb0bd5df9f62df418 Depends: libosmo-abis.git Change-Id I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif.git Change-Id I13d6e88158f6d9ce017986283183ee9c2cc68cae (cherry picked from commit 11854f52ac0a117d1161b2c82f5836680955082f) --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c04bc9e..ced8367 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -32,12 +32,12 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" +osmo-build-dep.sh libosmo-netif "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh osmo-ggsn osmo-build-dep.sh osmo-hlr if [ "x$IU" = "x--enable-iu" ]; then - osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sigtran osmo-build-dep.sh libasn1c #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: Id62040f41e9a5c233cc42eedb0bd5df9f62df418 Gerrit-Change-Number: 39542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-sgsn[pespin/base]: vty: Avoid accessing gsupclient object fields directly

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39543?usp=email ) Change subject: vty: Avoid accessing gsupclient object fields directly ...................................................................... vty: Avoid accessing gsupclient object fields directly Use new APIs recently added. Depends: osmo-hlr.git Change-Id I401af83232022f1c141eef1f428cbe206a8aaaa2 Change-Id: Ie443ef0bd983635a5b29e434d79b93ef3f7ce370 (cherry picked from commit 6668b2b29a5c1e8b7a22c66df95795485e204a8a) --- M TODO-RELEASE M src/sgsn/sgsn_vty.c 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index eb1cdfd..02149e5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libgtp >1.12.0 new field dir_tun_flags in struct pdp_t libgtp >1.12.0 gtp_set_cb_update_context_ind(), gtp_update_context_resp() +libosmo-gsup-client >1.8.0 osmo_gsup_client_is_connected(), osmo_gsup_client_get_rem_addr(), osmo_gsup_client_get_rem_port() diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index bcb8dc2..113fdd1 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -669,11 +669,10 @@ SHOW_STR "Display information about the SGSN") { if (sgsn->gsup_client) { - struct ipa_client_conn *link = sgsn->gsup_client->link; - vty_out(vty, - " Remote authorization: %sconnected to %s:%d via GSUP%s", - sgsn->gsup_client->is_connected ? "" : "not ", - link->addr, link->port, + vty_out(vty, " Remote authorization: %sconnected to %s:%d via GSUP%s", + osmo_gsup_client_is_connected(sgsn->gsup_client) ? "" : "not ", + osmo_gsup_client_get_rem_addr(sgsn->gsup_client), + osmo_gsup_client_get_rem_port(sgsn->gsup_client), VTY_NEWLINE); } if (sgsn->gsn) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: Ie443ef0bd983635a5b29e434d79b93ef3f7ce370 Gerrit-Change-Number: 39543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-sgsn[pespin/base]: sgsn_vty: Drop unneeded use of abis/ipa.h header

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39545?usp=email ) Change subject: sgsn_vty: Drop unneeded use of abis/ipa.h header ...................................................................... sgsn_vty: Drop unneeded use of abis/ipa.h header The header is not needed and will eventually be deprecated. Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06 (cherry picked from commit 7a45b5748582594d8113c24d7de03dd4740ccb4e) --- M src/sgsn/sgsn_vty.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 113fdd1..2d41009 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -53,7 +53,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/crypt/gprs_cipher.h> #include <osmocom/crypt/utran_cipher.h> -#include <osmocom/abis/ipa.h> #include <osmocom/gprs/gprs_bssgp.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06 Gerrit-Change-Number: 39545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025