- gerrit-log - lists.osmocom.org

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as S6b Re-Auth-Request
by pespin 18 Mar '24

18 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?usp=email ) Change subject: Propagate SWx PPR as S6b Re-Auth-Request ...................................................................... Propagate SWx PPR as S6b Re-Auth-Request This commit implements the 3GPP TS 29.273 section 9.1.2.5 "Service Authorization Information Update Procedures". Related: OS#6400 Change-Id: I0e263dae37d5b8b3cdce2014787eb82910ed686a --- M src/aaa_diameter_s6b.erl M src/aaa_diameter_s6b_cb.erl M src/aaa_ue_fsm.erl 3 files changed, 96 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index f8f9027..1639d02 100644 --- a/src/aaa_diameter_s6b.erl +++ b/src/aaa_diameter_s6b.erl @@ -49,7 +49,7 @@ %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, peer_down/3]). -export([code_change/3]). --export([tx_as_request/1]). +-export([tx_reauth_request/1, tx_as_request/1]). -export([tx_aa_answer/2, tx_st_answer/2]). %% Diameter Application Definitions @@ -138,9 +138,30 @@ % handle_request(STR) was spawned into its own process, and it's blocked waiting for STA: Pid ! {sta, DiaRC}. +tx_reauth_request(NAI) -> + gen_server:call(?SERVER, {rar, NAI}). + tx_as_request(NAI) -> gen_server:call(?SERVER, {asr, NAI}). +handle_call({rar, NAI}, _From, State) -> + lager:debug("S6b Tx RAR NAI=~p~n", [NAI]), + SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, dia_s6b_origin_host, ?ENV_DEFAULT_ORIG_HOST)), + RAR = #'RAR'{'Session-Id' = SessionId, + 'Auth-Application-Id' = ?DIAMETER_APP_ID_S6b, + 'Re-Auth-Request-Type' = ?'RE-AUTH-REQUEST-TYPE_AUTHORIZE_ONLY', + 'User-Name' = [NAI] + }, + lager:debug("S6b Tx RAR: ~p~n", [RAR]), + Ret = diameter_call(RAR, State), + case Ret of + ok -> + {reply, ok, State}; + {error, Err} -> + lager:error("Error: ~w~n", [Err]), + {reply, {error, Err}, State} + end; + handle_call({asr, NAI}, _From, State) -> lager:debug("S6b Tx ASR NAI=~p~n", [NAI]), SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, dia_s6b_origin_host, ?ENV_DEFAULT_ORIG_HOST)), diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index b3f8d5f..8e2bcca 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -41,6 +41,15 @@ | Avps]}; % TODO: is there a simple way to capture all the following requests? prepare_request(#diameter_packet{msg = Req}, _, {_, Caps}) + when is_record(Req, 'RAR') -> + #diameter_caps{origin_host = {OH, DH}, origin_realm = {OR, DR}} = Caps, + Msg = Req#'RAR'{'Origin-Host' = OH, + 'Origin-Realm' = OR, + 'Destination-Realm' = DR, + 'Destination-Host' = DH}, + lager:debug("S6b prepare_request: ~p~n", [Msg]), + {send, Msg}; +prepare_request(#diameter_packet{msg = Req}, _, {_, Caps}) when is_record(Req, 'ASR') -> #diameter_caps{origin_host = {OH, DH}, origin_realm = {OR, DR}} = Caps, Msg = Req#'ASR'{'Origin-Host' = OH, @@ -134,6 +143,22 @@ erlang:error({unexpected, ?MODULE, ?LINE}). %% handle_answer/4 +handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer) when is_record(Msg, 'RAA') -> + lager:info("S6b Rx RAA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), + % Obtain Imsi from originating Request: + #'RAR'{'User-Name' = [NAI]} = Request, + Imsi = conv:nai_to_imsi(NAI), + PidRes = aaa_ue_fsm:get_pid_by_imsi(Imsi), + #'RAA'{'Result-Code' = ResultCode} = Msg, + DiaRC = #epdg_dia_rc{result_code = ResultCode}, + case conv:dia_rc_success(DiaRC) of + ok -> + aaa_ue_fsm:ev_rx_s6b_raa(PidRes, ok); + _ -> + aaa_ue_fsm:ev_rx_s6b_raa(PidRes, {error, DiaRC}) + end, + {ok, Msg}; + handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer) when is_record(Msg, 'ASA') -> lager:info("S6b Rx ASA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), % Obtain Imsi from originating Request: diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index b32d6c0..d2e4aad 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -44,7 +44,7 @@ -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([ev_rx_swm_auth_req/2, ev_rx_swm_reauth_answer/2, ev_rx_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_swx_ppr/2, ev_rx_swx_rtr/1, - ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_asa/2]). + ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_raa/2, ev_rx_s6b_asa/2]). -export([state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, @@ -175,6 +175,15 @@ {error, Err} end. +ev_rx_s6b_raa(Pid, Result) -> + lager:info("ue_fsm ev_rx_s6b_raa: ~p~n", [Result]), + try + gen_statem:call(Pid, {rx_s6b_raa, Result}) + catch + exit:Err -> + {error, Err} + end. + ev_rx_s6b_asa(Pid, Result) -> lager:info("ue_fsm ev_rx_s6b_asa: ~p~n", [Result]), try @@ -279,14 +288,24 @@ state_authenticated({call, {Pid, _Tag} = From}, {rx_s6b_aar, NAI, Apn, AgentInfoOpt}, Data) -> lager:info("ue_fsm state_authenticated event=rx_s6b_aar NAI=~p Apn=~p AgentInfo=~p, ~p~n", [NAI, Apn, AgentInfoOpt, Data]), - case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, - ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE', - Apn, AgentInfoOpt) of - ok -> Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid, nai = NAI, apn = Apn}, - {next_state, state_authenticated_wait_swx_saa, Data1, [{reply,From,ok}]}; - {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} + %% TODO: Actually here we'd need to send SAR based on whether + %% PGW Address changed in AgentInfoOpt, which for sure didn't in + %% current status of osmo-epdg... + case Data#ue_fsm_data.pgw_sess_active of + false -> + case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, + ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE', + Apn, AgentInfoOpt) of + ok -> Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid, nai = NAI, apn = Apn}, + {next_state, state_authenticated_wait_swx_saa, Data1, [{reply,From,ok}]}; + {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} + end; + true -> + aaa_diameter_s6b:tx_aa_answer(Pid, #epdg_dia_rc{result_code = 2001}), + {keep_state, Data, [{reply,From,ok}]} end; + state_authenticated({call, From}, rx_swm_str, Data) -> lager:info("ue_fsm state_authenticated event=rx_swm_str, ~p~n", [Data]), case {Data#ue_fsm_data.epdg_sess_active, Data#ue_fsm_data.pgw_sess_active} of @@ -340,16 +359,22 @@ %% After a successful user profile download, the 3GPP AAA Server shall %% initiate re-authentication procedure as described %% in clause 7.2.2.4 - case aaa_diameter_swm:tx_reauth_request(Data#ue_fsm_data.imsi) of - ok -> {keep_state, Data, [{reply,From,ok}]}; - {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} - end; + aaa_diameter_swm:tx_reauth_request(Data#ue_fsm_data.imsi), + aaa_diameter_s6b:tx_reauth_request(Data#ue_fsm_data.nai), + %% Following a successful download of subscription and equipment trace data, the 3GPP AAA Server shall forward the + %% trace data by initiating reauthorization towards all PDN GWs that have an active authorization session. + {keep_state, Data, [{reply,From,ok}]}; state_authenticated({call, From}, {rx_swm_reauth_answer, Result}, Data) -> lager:info("ue_fsm state_authenticated event=rx_swm_reauth_answer ~p, ~p~n", [Result, Data]), %% SWx PPA was already answered immediately when PPR was received, nothing to do here. {keep_state, Data, [{reply,From,ok}]}; +state_authenticated({call, From}, {rx_s6b_raa, Result}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_s6b_raa ~p, ~p~n", [Result, Data]), + %% SWx PPA was already answered immediately when PPR was received, nothing to do here. + {keep_state, Data, [{reply,From,ok}]}; + state_authenticated({call, From}, rx_swx_rtr, Data) -> lager:info("ue_fsm state_authenticated event=rx_swx_rtr ~p~n", [Data]), case {Data#ue_fsm_data.pgw_sess_active, Data#ue_fsm_data.epdg_sess_active} of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I0e263dae37d5b8b3cdce2014787eb82910ed686a Gerrit-Change-Number: 36308 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as S6b Re-Auth-Request
by pespin 18 Mar '24

18 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?usp=email ) Change subject: Propagate SWx PPR as S6b Re-Auth-Request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I0e263dae37d5b8b3cdce2014787eb82910ed686a Gerrit-Change-Number: 36308 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 13:47:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: debian/rules: make configure args diff friendly
by osmith 18 Mar '24

18 Mar '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36328?usp=email ) Change subject: debian/rules: make configure args diff friendly ...................................................................... debian/rules: make configure args diff friendly Have one arg per line, and order it mostly alphabetically while at it (backends are still together, as recommended in review). Change-Id: I354affacb38958efe70baedc6175aeab525190a6 --- M debian/rules 1 file changed, 20 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/rules b/debian/rules index 5795643..e6cac87 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,14 @@ dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info override_dh_auto_configure: - dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-ipc --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals + dh_auto_configure -- \ + --enable-manuals \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --with-ipc \ + --with-lms \ + --with-uhd \ + --with-usrp1 \ + $(NULL) override_dh_strip: dh_strip --dbg-package=osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36328?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I354affacb38958efe70baedc6175aeab525190a6 Gerrit-Change-Number: 36328 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in gapk[master]: debian: initial
by pespin 18 Mar '24

18 Mar '24

Attention is currently required from: Hoernchen, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/36335?usp=email ) Change subject: debian: initial ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/36335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I8e9d42fc332c5d426b9074c6bc58bc6efe037fea Gerrit-Change-Number: 36335 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 13:37:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in gapk[master]: gitignore: add .version and *~
by pespin 18 Mar '24

18 Mar '24

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/36334?usp=email ) Change subject: gitignore: add .version and *~ ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/36334?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: If0b4c559727b04532353b267180c9d465b323d12 Gerrit-Change-Number: 36334 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 13:37:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-hnbgw[master]: RAB activation/modification/release statistics
by pespin 18 Mar '24

18 Mar '24

Attention is currently required from: dexter, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36311?usp=email ) Change subject: RAB activation/modification/release statistics ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I198fa37699e22380909764de6a0522ac79aa1d39 Gerrit-Change-Number: 36311 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 13:36:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in gapk[master]: debian: initial
by osmith 18 Mar '24

18 Mar '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/gapk/+/36335?usp=email to look at the new patch set (#2). Change subject: debian: initial ...................................................................... debian: initial Related: OS#6409 Change-Id: I8e9d42fc332c5d426b9074c6bc58bc6efe037fea --- A debian/changelog A debian/compat A debian/control A debian/copyright A debian/gapk.install A debian/libosmogapk-dev.install A debian/libosmogapk0.install A debian/rules A debian/source/format 9 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/35/36335/2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/36335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I8e9d42fc332c5d426b9074c6bc58bc6efe037fea Gerrit-Change-Number: 36335 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in gapk[master]: gitignore: add .version and *~
by osmith 18 Mar '24

18 Mar '24

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/36334?usp=email ) Change subject: gitignore: add .version and *~ ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: debian:12 CI check failing here is expected, debian packaging gets added in the next patch -- To view, visit https://gerrit.osmocom.org/c/gapk/+/36334?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: If0b4c559727b04532353b267180c9d465b323d12 Gerrit-Change-Number: 36334 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Mar 2024 13:27:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in gapk[master]: gitignore: add .version and *~
by osmith 18 Mar '24

18 Mar '24

Attention is currently required from: osmith. osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/gapk/+/36334?usp=email ) Change subject: gitignore: add .version and *~ ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/gapk/+/36334?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: If0b4c559727b04532353b267180c9d465b323d12 Gerrit-Change-Number: 36334 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

[S] Change in gapk[master]: gitignore: add .version and *~
by osmith 18 Mar '24

18 Mar '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/gapk/+/36334?usp=email ) Change subject: gitignore: add .version and *~ ...................................................................... gitignore: add .version and *~ Use *~ instead of *.*~, so it covers configure~ too. Change-Id: If0b4c559727b04532353b267180c9d465b323d12 --- M .gitignore 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/34/36334/1 diff --git a/.gitignore b/.gitignore index 15329a5..d2f9840 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ configure.scan # autoreconf by-products +.version Makefile.in - aclocal.m4 autom4te.cache/ config.guess @@ -49,7 +49,7 @@ src/osmo-gapk # temporary/backup files -*.*~ +*~ .*.swp /compile .dirstamp -- To view, visit https://gerrit.osmocom.org/c/gapk/+/36334?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: If0b4c559727b04532353b267180c9d465b323d12 Gerrit-Change-Number: 36334 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log