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

[M] Change in ...osmo-epdg[master]: Enable the use of an UE requested IP type and address to be used for ...

by fixeria

Attention is currently required from: clufn. fixeria has posted comments on this change by clufn. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email ) Change subject: Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 Gerrit-Change-Number: 40277 Gerrit-PatchSet: 1 Gerrit-Owner: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Comment-Date: Sun, 11 May 2025 06:24:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[M] Change in ...osmo-epdg[master]: Enable the use of an UE requested IP type and address to be used for ...

by clufn

clufn has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email ) Change subject: Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation ...................................................................... Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 --- M src/conv.erl M src/epdg_gtpc_s2b.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 4 files changed, 43 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/77/40277/1 diff --git a/src/conv.erl b/src/conv.erl index 5832c64..d2a54ab 100644 --- a/src/conv.erl +++ b/src/conv.erl @@ -41,7 +41,7 @@ -export([ip_to_bin/1, bin_to_ip/1]). -export([cause_gtp2gsup/1]). -export([dia_rc_success/1, dia_rc_to_gsup_cause/1]). --export([gtp2_paa_to_epdg_eua/1, epdg_eua_to_gsup_pdp_address/1]). +-export([gtp2_paa_to_epdg_eua/1, pdp_address_to_gtp2_paa/2, epdg_eua_to_gsup_pdp_address/1]). -export([nai_to_imsi/1]). % ergw_aaa/src/ergw_aaa_3gpp_dict.erl @@ -62,6 +62,9 @@ bin_to_ip({_, _, _, _, _, _, _, _} = IP) -> IP. +%% Add "IPv6 Prefix Length" to PAA (3GPP TS 29.274 Table 8.14). +add_v6_prefix_len_byte(<< IPv6:16/binary >>) -> << 8, IPv6/binary >>. + %% Remove "IPv6 Prefix Length" from PAA (3GPP TS 29.274 Table 8.14). remove_v6_prefix_len_byte(<<_:8, Rest/binary>>) -> Rest. @@ -129,6 +132,13 @@ ipv4 = get_4_from_v4v6(Addr), ipv6 = get_6_from_v4v6(Addr)}. +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv4, Address) -> + #v2_pdn_address_allocation{type = ipv4, address = maps:get(ipv4,Address)}; +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv6, Address) -> + #v2_pdn_address_allocation{type = ipv6, address = add_v6_prefix_len_byte(maps:get(ipv6,Address))}; +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv4v6, Address) -> + #v2_pdn_address_allocation{type = ipv4v6, address = get_v4v6(maps:get(ipv4,Address),maps:get(ipv6,Address))}. + epdg_eua_to_gsup_pdp_address(#epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, ipv4 = Addr}) -> #{pdp_type_org => 1, pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv4, diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 4b88be3..d4d2b71 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -48,7 +48,7 @@ %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3]). --export([create_session_req/4, delete_session_req/1]). +-export([create_session_req/5, delete_session_req/1]). %% Application Definitions -define(SERVER, ?MODULE). @@ -144,13 +144,13 @@ lager:error("GTPv2C UDP socket open error: ~w~n", [Reason]) end. -create_session_req(Imsi, Apn, APCO, PGWAddrCandidateList) -> - gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}). +create_session_req(Imsi, Apn, APCO, Paa, PGWAddrCandidateList) -> + gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO, Paa, PGWAddrCandidateList}}). delete_session_req(Imsi) -> gen_server:call(?SERVER, {gtpc_delete_session_req, {Imsi}}). -handle_call({gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}, {Pid, _Tag} = _From, State0) -> +handle_call({gtpc_create_session_req, {Imsi, Apn, APCO, Paa, PGWAddrCandidateList}}, {Pid, _Tag} = _From, State0) -> RemoteAddrStr = pick_gtpc_remote_address(PGWAddrCandidateList, State0), lager:debug("Selected PGW Remote Address ~p~n", [RemoteAddrStr]), {ok, RemoteAddrInet} = inet_parse:address(RemoteAddrStr), @@ -160,7 +160,7 @@ raddr_str = RemoteAddrInet, raddr = RemoteAddrInet}, State0), - Req = gen_create_session_request(Sess0, APCO, State1), + Req = gen_create_session_request(Sess0, APCO, Paa, State1), tx_gtp(Req, State1), State2 = inc_seq_no(State1), lager:debug("Waiting for CreateSessionResponse~n", []), @@ -514,6 +514,7 @@ apn = Apn, local_control_tei = LocalCtlTEI} = Sess, APCO, + Paa, #gtp_state{laddr = LocalAddr, laddr_gtpu = LocalAddrGtpu, restart_counter = RCnt, @@ -548,7 +549,7 @@ }, #v2_access_point_name{instance = 0, apn = [Apn]}, #v2_selection_mode{mode = 0}, - #v2_pdn_address_allocation{type = ipv4, address = <<0,0,0,0>>}, + Paa, %% v2_pdn_address_allocation #v2_bearer_context{group = BearersIE}, #v2_recovery{restart_counter = RCnt}, #v2_additional_protocol_configuration_options{instance = 0, config = APCO_decoded} diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 2e4f417..220bc5e 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -66,6 +66,7 @@ -record(ue_fsm_data, { imsi, + paa, apn = "internet" :: string(), pgw_rem_addr_list = [] :: list(), tun_pdp_ctx :: #epdg_tun_pdp_ctx{}, @@ -96,10 +97,10 @@ {error, Err} end. -auth_request(Pid, {PdpTypeNr, Apn, EAP}) -> +auth_request(Pid, {PdpTypeNr, PdpAddress, Apn, EAP}) -> lager:info("ue_fsm auth_request~n", []), try - gen_statem:call(Pid, {auth_request, PdpTypeNr, Apn, EAP}) + gen_statem:call(Pid, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}) catch exit:Err -> {error, Err} @@ -227,7 +228,7 @@ %% Internal helpers %% ------------------------------------------------------------------ -ev_handle({call, From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> +ev_handle({call, From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> epdg_diameter_swm:tx_der_auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn, EAP), {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}. @@ -258,9 +259,10 @@ state_new(enter, _OldState, Data) -> {keep_state, Data}; -state_new({call, _From} = EvType, {auth_request, PdpTypeNr, Apn, EAP} = EvContent, Data) -> - lager:info("ue_fsm state_new event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), - ev_handle(EvType, EvContent, Data); +state_new({call, _From} = EvType, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP} = EvContent, Data) -> + lager:info("ue_fsm state_new event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), + Data1 = Data#ue_fsm_data{paa = conv:pdp_address_to_gtp2_paa(PdpTypeNr, PdpAddress), apn = Apn}, + ev_handle(EvType, EvContent, Data1); state_new({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), @@ -300,8 +302,8 @@ state_authenticating(enter, _OldState, Data) -> {keep_state, Data}; -state_authenticating({call, _From} = EvType, {auth_request, PdpTypeNr, Apn, EAP} = EvContent, Data) -> - lager:info("ue_fsm state_authenticating event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticating({call, _From} = EvType, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP} = EvContent, Data) -> + lager:info("ue_fsm state_authenticating event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), ev_handle(EvType, EvContent, Data); state_authenticating({call, From}, lu_request, Data) -> @@ -339,8 +341,8 @@ state_authenticated(enter, _OldState, Data) -> {keep_state, Data}; -state_authenticated({call, _From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_authenticated event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticated({call, _From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> + lager:info("ue_fsm state_authenticated event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; state_authenticated({call, From}, {tunnel_request, PCO}, Data) -> @@ -348,6 +350,7 @@ epdg_gtpc_s2b:create_session_req(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn, PCO, + Data#ue_fsm_data.paa, Data#ue_fsm_data.pgw_rem_addr_list), {next_state, state_wait_create_session_resp, Data, [{reply,From,ok}]}; @@ -437,8 +440,8 @@ state_active(enter, _OldState, Data) -> {keep_state, Data}; -state_active({call, _From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_active event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_active({call, _From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> + lager:info("ue_fsm state_active event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), gtp_u_tun:delete_pdp_context(Data#ue_fsm_data.tun_pdp_ctx), Data1 = Data#ue_fsm_data{tun_pdp_ctx = undefined}, {next_state, state_new, Data1, [postpone]}; diff --git a/src/gsup_server.erl b/src/gsup_server.erl index c5d3738..c4c28cf 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -296,13 +296,20 @@ case maps:find(pdp_info_list, GsupMsgRx) of {ok, [PdpInfo]} -> #{pdp_context_id := _PDPCtxId, - pdp_address := #{address := #{}, + pdp_address := #{address := PdpAddress, pdp_type_nr := PdpTypeNr, pdp_type_org := 241}, access_point_name := Apn - } = PdpInfo; + } = PdpInfo, + case maps:is_key(ipv4,PdpAddress) or maps:is_key(ipv6,PdpAddress) of + true -> ok; %% Address received so do nothing + false -> %% No address received from strongswan, use a default value + PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, + PdpAddress = #{ipv4 => <<0,0,0,0>>} + end; error -> % Use some sane defaults: PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, + PdpAddress = #{ipv4 => <<0,0,0,0>>}, Apn = "*" end, EAP = parse_eap(GsupMsgRx), @@ -310,7 +317,7 @@ undefined -> {ok, Pid} = epdg_ue_fsm:start(Imsi); Pid -> Pid end, - case epdg_ue_fsm:auth_request(Pid, {PdpTypeNr, Apn, EAP}) of + case epdg_ue_fsm:auth_request(Pid, {PdpTypeNr, PdpAddress, Apn, EAP}) of ok -> ok; {error, Err} -> lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 Gerrit-Change-Number: 40277 Gerrit-PatchSet: 1 Gerrit-Owner: clufn <callumfarrbennett(a)yahoo.com>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL)

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email to look at the new patch set (#4). Change subject: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL) ...................................................................... Support tearing down PFCP upon PS-RAB-ASS-REQ (REL) Before this patch, RAB Assign Request containing only a ReleaseList where being discarded with an error. This commit adds logic to allow passing those messages, and upon RAB Assign Response, tear down the related PFCP sessions before forwarding it back to the CN. This is scenario is tested in TTCN-3 testsuite HNBGW_Tests.TC_ps_rab_release. Related: SYS#7451 Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 --- M include/osmocom/hnbgw/ps_rab_ass_fsm.h M include/osmocom/hnbgw/ps_rab_fsm.h M src/osmo-hnbgw/ps_rab_ass_fsm.c M src/osmo-hnbgw/ps_rab_fsm.c 4 files changed, 141 insertions(+), 66 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/75/40275/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 Gerrit-Change-Number: 40275 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL)

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email ) Change subject: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 Gerrit-Change-Number: 40275 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 May 2025 18:24:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests TC_ps_rab_release(_abnormal)

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40272?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: hnbgw: Introduce tests TC_ps_rab_release(_abnormal) ...................................................................... hnbgw: Introduce tests TC_ps_rab_release(_abnormal) Same as their existing CS counterparts TC_rab_release(_abnormal). Related: SYS#7451 Change-Id: Ia25efc2d6bf01d4a13e7fd1ce0563d20dd2e321e --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/expected-results.xml M library/ranap/RANAP_Templates.ttcn 3 files changed, 152 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/40272/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia25efc2d6bf01d4a13e7fd1ce0563d20dd2e321e Gerrit-Change-Number: 40272 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: WIP: Support PS RAB ASS REQ (REL)

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email ) Change subject: WIP: Support PS RAB ASS REQ (REL) ...................................................................... WIP: Support PS RAB ASS REQ (REL) Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 110 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/75/40275/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 Gerrit-Change-Number: 40275 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over ...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40276?usp=email ) Change subject: ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over SCCP fails ...................................................................... ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over SCCP fails ps_rab_ass_failure() is already calling osmo_fsm_inst_term(rab_ass->fi(), which will free "fi" and its child talloc struct "rab_ass". Hence, return early as done everywher else in order to avoid accessing the struct again. Change-Id: Id605f2b279a4d886399de27f6a94622ad7bf982b --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/76/40276/1 diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index fc3b605..fc15fff 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -633,8 +633,8 @@ if (rc < 0) { LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Sending RANAP PS RAB-AssignmentResponse failed\n"); ps_rab_ass_failure(rab_ass); + return; } - /* The request message has been forwarded. We are done. */ osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40276?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id605f2b279a4d886399de27f6a94622ad7bf982b Gerrit-Change-Number: 40276 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: WIP: Support PS RAB ASS REQ (REL)

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email ) Change subject: WIP: Support PS RAB ASS REQ (REL) ...................................................................... WIP: Support PS RAB ASS REQ (REL) Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 48 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/75/40275/1 diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index 68bf58a..fc3b605 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -220,6 +220,7 @@ RANAP_RAB_AssignmentRequestIEs_t *ies = &message->msg.raB_AssignmentRequestIEs; int i; struct ps_rab_ass *rab_ass; + int rc; rab_ass = ps_rab_ass_alloc(map); talloc_steal(rab_ass, message); @@ -231,26 +232,57 @@ goto no_rab; } - /* Make sure we indeed deal with a setup-or-modify list */ - if (!(ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT)) { - LOG_MAP(map, DLPFCP, LOGL_ERROR, "RANAP PS RAB AssignmentRequest lacks setup-or-modify list\n"); - goto no_rab; + /* setup-or-modify list */ + if (ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT) { + /* Multiple RABs may be set up, assemble in list map->ps_rab_list. */ + for (i = 0; i < ies->raB_SetupOrModifyList.list.count; i++) { + RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; + RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + + protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[i]; + protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; + if (!protocol_ie_field_pair) + goto no_rab; + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) + goto no_rab; + + if (ps_rab_setup_core_remote(rab_ass, protocol_ie_field_pair)) + goto no_rab; + } } - /* Multiple RABs may be set up, assemble in list map->ps_rab_list. */ - for (i = 0; i < ies->raB_SetupOrModifyList.list.count; i++) { - RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; - RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + /* release list */ + if (ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_RELEASELIST_PRESENT) { + /* Multiple RABs may be set up, assemble in list map->ps_rab_list. */ + for (i = 0; i < ies->raB_ReleaseList.raB_ReleaseList_ies.list.count; i++) { + RANAP_IE_t *release_list_ie; + RANAP_RAB_ReleaseItemIEs_t *items_ies = NULL; + RANAP_RAB_ReleaseItem_t *rab_release_item; + uint8_t rab_id_decoded; + struct ps_rab *rab; - protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[i]; - protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; - if (!protocol_ie_field_pair) - goto no_rab; - if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) - goto no_rab; + release_list_ie = ies->raB_ReleaseList.raB_ReleaseList_ies.list.array[i]; + if (!release_list_ie) + goto no_rab; + if (release_list_ie->id != RANAP_ProtocolIE_ID_id_RAB_ReleaseItem) + goto no_rab; - if (ps_rab_setup_core_remote(rab_ass, protocol_ie_field_pair)) - goto no_rab; + rc = ranap_decode_rab_releaseitemies_fromlist(items_ies, &release_list_ie->value); + if (rc < 0) + return -EINVAL; + + rab_release_item = &items_ies->raB_ReleaseItem; + /* The RAB-ID is defined as a bitstring with a size of 8 (1 byte), + * See also RANAP-IEs.asn, RAB-ID ::= BIT STRING (SIZE (8)) */ + rab_id_decoded = rab_release_item->rAB_ID.buf[0]; + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_ReleaseItem, items_ies); + + rab = ps_rab_get(map, rab_id_decoded); + if (rab) + ps_rab_release(rab); + else + LOG_MAP(map, DLPFCP, LOGL_NOTICE, "Rx RAB ASS REQ (REL) for unknwon rab_id %u\n", rab_id_decoded); + } } /* Got all RABs' state and their Core side GTP info in map->ps_rab_list. For each, a ps_rab_fsm has been started and -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 Gerrit-Change-Number: 40275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: Clean up calls to ps_rab_ass_fsm_state_chg()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?usp=email ) Change subject: Clean up calls to ps_rab_ass_fsm_state_chg() ...................................................................... Clean up calls to ps_rab_ass_fsm_state_chg() Change-Id: I7c9a67ebe192ba30fa474f84eaee1db2a718fa35 --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 3 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/40274/1 diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index f76b1cf..68bf58a 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -118,7 +118,7 @@ /* PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED is terminated by PFCP timeouts via ps_rab_fsm */ }; -#define ps_rab_ass_fsm_state_chg(state) \ +#define ps_rab_ass_fsm_state_chg(fi, state) \ osmo_tdef_fsm_inst_state_chg(fi, state, ps_rab_ass_fsm_timeouts, hnbgw_T_defs, -1) static struct osmo_fsm ps_rab_ass_fsm; @@ -219,12 +219,9 @@ { RANAP_RAB_AssignmentRequestIEs_t *ies = &message->msg.raB_AssignmentRequestIEs; int i; - struct ps_rab_ass *rab_ass; - struct osmo_fsm_inst *fi; rab_ass = ps_rab_ass_alloc(map); - talloc_steal(rab_ass, message); rab_ass->ranap_rab_ass_req_message = message; /* Now rab_ass owns message and will clean it up */ @@ -258,8 +255,7 @@ /* Got all RABs' state and their Core side GTP info in map->ps_rab_list. For each, a ps_rab_fsm has been started and * each will call back with PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX or PS_RAB_ASS_EV_RAB_FAIL. */ - fi = rab_ass->fi; - return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); no_rab: ps_rab_ass_failure(rab_ass); @@ -416,7 +412,6 @@ int rc; int i; struct ps_rab_ass *rab_ass; - struct osmo_fsm_inst *fi; RANAP_RAB_AssignmentResponseIEs_t *ies; /* Make sure we indeed deal with a setup-or-modify list */ @@ -472,8 +467,7 @@ /* Got all RABs' state and updated their Access side GTP info in map->ps_rab_list. For each RAB ID, the matching * ps_rab_fsm has been instructed to tell the UPF about the Access Remote GTP F-TEID. Each will call back with * PS_RAB_ASS_EV_RAB_ESTABLISHED or PS_RAB_ASS_EV_RAB_FAIL. */ - fi = rab_ass->fi; - return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); + return ps_rab_ass_fsm_state_chg(rab_ass->fi, PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); } static void ps_rab_ass_resp_send_if_ready(struct ps_rab_ass *rab_ass); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7c9a67ebe192ba30fa474f84eaee1db2a718fa35 Gerrit-Change-Number: 40274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: context_map: Rename ps_rab(_ass) to denote it is a list

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: context_map: Rename ps_rab(_ass) to denote it is a list ...................................................................... context_map: Rename ps_rab(_ass) to denote it is a list This allows also easily grepping to figure out where it is used, otherwise it was named like the struct, fsm, etc. Change-Id: I6ac029e6a820a031a443dae8c83e44f6ae9fb5fa --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/ps_rab_ass_fsm.c M src/osmo-hnbgw/ps_rab_fsm.c 4 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/73/40273/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6ac029e6a820a031a443dae8c83e44f6ae9fb5fa Gerrit-Change-Number: 40273 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025