- gerrit-log - lists.osmocom.org

[S] Change in libosmo-netif[master]: docs: Don't export documentation about static (internal) functions
by laforge 15 Mar '24

15 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36292?usp=email ) Change subject: docs: Don't export documentation about static (internal) functions ...................................................................... docs: Don't export documentation about static (internal) functions The generated API documentation should be relevant to the API user, and hence only non-static/public functions are relevant Change-Id: I6fee052ad22877db85fe3207c7eac950d875873b --- M Doxyfile.in 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/Doxyfile.in b/Doxyfile.in index a7fe3ad..001a085 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -328,7 +328,7 @@ # If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. -EXTRACT_STATIC = YES +EXTRACT_STATIC = NO # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) # defined locally in source files will be included in the documentation. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36292?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6fee052ad22877db85fe3207c7eac950d875873b Gerrit-Change-Number: 36292 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: docs: Enable AUTOBRIEF feauture in doxygen
by laforge 15 Mar '24

15 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36290?usp=email ) Change subject: docs: Enable AUTOBRIEF feauture in doxygen ...................................................................... docs: Enable AUTOBRIEF feauture in doxygen We have that enabled in libosmcore.git for ages, somehow we missed it here, resulting in missing 'brief' descriptions in the output. Change-Id: I751036baa9a2b30d94a2a302c7072a5487d2c26e --- M Doxyfile.in 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/Doxyfile.in b/Doxyfile.in index 3843f79..a7fe3ad 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -150,7 +150,7 @@ # comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) -JAVADOC_AUTOBRIEF = NO +JAVADOC_AUTOBRIEF = YES # If the QT_AUTOBRIEF tag is set to YES then Doxygen will # interpret the first line (until the first dot) of a Qt-style @@ -158,7 +158,7 @@ # will behave just like regular Qt-style comments (thus requiring # an explicit \brief command for a brief description.) -QT_AUTOBRIEF = NO +QT_AUTOBRIEF = YES # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen # treat a multi-line C++ special comment block (i.e. a block of //! or /// -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I751036baa9a2b30d94a2a302c7072a5487d2c26e Gerrit-Change-Number: 36290 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: docs: Use \defgroup and avoid repeated boilerplate text
by laforge 15 Mar '24

15 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36291?usp=email ) Change subject: docs: Use \defgroup and avoid repeated boilerplate text ...................................................................... docs: Use \defgroup and avoid repeated boilerplate text Change-Id: I1196c3b035f495c5dbaa4d47ce3f79a08d0727f2 --- M include/osmocom/netif/stream.h M src/stream.c M src/stream_cli.c M src/stream_srv.c 4 files changed, 20 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index fe4dd77..96633d6 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -6,8 +6,15 @@ #include <osmocom/core/msgb.h> -/*! \addtogroup stream +/*! \defgroup stream Osmocom Stream Server/Client * @{ + * + * This code is intended to abstract any use of stream-type sockets, + * such as TCP and SCTP. It offers both server and client side + * implementations, fully integrated with the libosmocore select loop + * abstraction. + * + * \file stream.h */ /*! \brief Access SCTP flags from the msgb control buffer */ diff --git a/src/stream.c b/src/stream.c index f4755e0..60a7623 100644 --- a/src/stream.c +++ b/src/stream.c @@ -52,13 +52,8 @@ #include <osmocom/netif/sctp.h> -/*! \addtogroup stream Osmocom Stream Socket +/*! \addtogroup stream * @{ - * - * This code is intended to abstract any use of stream-type sockets, - * such as TCP and SCTP. It offers both server and client side - * implementations, fully integrated with the libosmocore select loop - * abstraction. */ /*! \file stream.c diff --git a/src/stream_cli.c b/src/stream_cli.c index 46ddc89..9c3f65a 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -52,12 +52,8 @@ #include <osmocom/netif/sctp.h> -/*! \addtogroup stream Osmocom Stream Socket (client side) +/*! \addtogroup stream * @{ - * - * This code is intended to abstract any use of stream-type sockets, - * such as TCP and SCTP. It offers client side implementation, - * fully integrated with the libosmocore select loop abstraction. */ /*! \file stream_cli.c diff --git a/src/stream_srv.c b/src/stream_srv.c index da49bad..58ed7ef 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -53,12 +53,8 @@ #include <osmocom/netif/sctp.h> -/*! \addtogroup stream Osmocom Stream Socket (server side) +/*! \addtogroup stream * @{ - * - * This code is intended to abstract any use of stream-type sockets, - * such as TCP and SCTP. It offers server side implementation, - * fully integrated with the libosmocore select loop abstraction. */ /*! \file stream_srv.c -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36291?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1196c3b035f495c5dbaa4d47ce3f79a08d0727f2 Gerrit-Change-Number: 36291 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: Makefile.am: Fix dependency: rebuild doxygen on src/include changes
by laforge 15 Mar '24

15 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36289?usp=email ) Change subject: Makefile.am: Fix dependency: rebuild doxygen on src/include changes ...................................................................... Makefile.am: Fix dependency: rebuild doxygen on src/include changes Change-Id: Id28f0927d01f82ceb969fb7c758cb391b86631c1 --- M Makefile.am 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index f1b8046..3e119b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ $(html_DATA): $(top_builddir)/doc/html/index.html cd $(top_builddir)/doc && tar cf html.tar html -$(top_builddir)/doc/html/index.html: $(SOURCES) Doxyfile +$(top_builddir)/doc/html/index.html: $(SOURCES) $(top_srcdir)/src/*.c $(top_srcdir)/include/osmocom/netif/*.h Doxyfile @rm -rf doc mkdir -p doc $(DOXYGEN) Doxyfile -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id28f0927d01f82ceb969fb7c758cb391b86631c1 Gerrit-Change-Number: 36289 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: Makefile.am: Fix dependency: rebuild doxygen on src/include changes
by laforge 15 Mar '24

15 Mar '24

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36289?usp=email ) Change subject: Makefile.am: Fix dependency: rebuild doxygen on src/include changes ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File Makefile.am: https://gerrit.osmocom.org/c/libosmo-netif/+/36289/comment/7aa3641f_38829c4d PS2, Line 33: $(SOURCES) > Ack Implemented in https://gerrit.osmocom.org/c/libosmo-netif/+/36313 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id28f0927d01f82ceb969fb7c758cb391b86631c1 Gerrit-Change-Number: 36289 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Mar 2024 20:13:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: Makefile.am: Remove $(SOURCES) which is not defined anywhere
by laforge 15 Mar '24

15 Mar '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36313?usp=email ) Change subject: Makefile.am: Remove $(SOURCES) which is not defined anywhere ...................................................................... Makefile.am: Remove $(SOURCES) which is not defined anywhere Change-Id: I44ce77c937fa461445800bab393025f948077d55 --- M Makefile.am 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/13/36313/1 diff --git a/Makefile.am b/Makefile.am index 3e119b2..f50cd0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ $(html_DATA): $(top_builddir)/doc/html/index.html cd $(top_builddir)/doc && tar cf html.tar html -$(top_builddir)/doc/html/index.html: $(SOURCES) $(top_srcdir)/src/*.c $(top_srcdir)/include/osmocom/netif/*.h Doxyfile +$(top_builddir)/doc/html/index.html: $(top_srcdir)/src/*.c $(top_srcdir)/include/osmocom/netif/*.h Doxyfile @rm -rf doc mkdir -p doc $(DOXYGEN) Doxyfile -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36313?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I44ce77c937fa461445800bab393025f948077d55 Gerrit-Change-Number: 36313 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: Prepend rx_ prefix to SWm events missing it
by pespin 15 Mar '24

15 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36304?usp=email ) Change subject: aaa_ue_fsm: Prepend rx_ prefix to SWm events missing it ...................................................................... aaa_ue_fsm: Prepend rx_ prefix to SWm events missing it Change-Id: I38f755c23d8b998adbb591e1178fa31245ae0ab4 --- M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl 2 files changed, 24 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index e424ba8..9fa656e 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -64,13 +64,13 @@ undefined -> {ok, Pid} = aaa_ue_fsm:start(Imsi); Pid -> Pid end, - aaa_ue_fsm:ev_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}), + aaa_ue_fsm:ev_rx_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}), {noreply, State}; handle_cast({epdg_auth_compl_req, Imsi, Apn}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - aaa_ue_fsm:ev_swm_auth_compl(Pid, Apn); + aaa_ue_fsm:ev_rx_swm_auth_compl(Pid, Apn); undefined -> RC_USER_UNKNOWN=5030, epdg_diameter_swm:rx_auth_compl_response(Imsi, {error, RC_USER_UNKNOWN}) diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index c61a4bf..9ec6a00 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,7 +42,7 @@ -export([start/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). --export([ev_swm_auth_req/2, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, +-export([ev_rx_swm_auth_req/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_rtr/1, ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_asa/2]). -export([state_new/3, @@ -86,19 +86,19 @@ {error, Err} end. -ev_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}) -> - lager:info("ue_fsm ev_swm_auth_req~n", []), +ev_rx_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}) -> + lager:info("ue_fsm ev_rx_swm_auth_req~n", []), try - gen_statem:call(Pid, {swm_auth_req, PdpTypeNr, Apn, EAP}) + gen_statem:call(Pid, {rx_swm_auth_req, PdpTypeNr, Apn, EAP}) catch exit:Err -> {error, Err} end. -ev_swm_auth_compl(Pid, Apn) -> - lager:info("ue_fsm ev_swm_auth_compl~n", []), +ev_rx_swm_auth_compl(Pid, Apn) -> + lager:info("ue_fsm ev_rx_swm_auth_compl~n", []), try - gen_statem:call(Pid, {swm_auth_compl, Apn}) + gen_statem:call(Pid, {rx_swm_auth_compl, Apn}) catch exit:Err -> {error, Err} @@ -203,8 +203,8 @@ state_new(enter, _OldState, Data) -> {keep_state, Data}; -state_new({call, From}, {swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_new event=swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_new({call, From}, {rx_swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> + lager:info("ue_fsm state_new event=rx_swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), case maps:find(authorization, EAP) of {ok, Authorization} when is_binary(Authorization) -> Authorization; error -> Authorization = [] @@ -214,8 +214,8 @@ {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end; -state_new({call, From}, {swm_auth_compl, Apn}, Data) -> - lager:info("ue_fsm state_new event=swm_auth_compl, ~p~n", [Data]), +state_new({call, From}, {rx_swm_auth_compl, Apn}, Data) -> + lager:info("ue_fsm state_new event=rx_swm_auth_compl, ~p~n", [Data]), case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, 1, Apn, []) of ok -> {next_state, state_wait_swx_saa, Data, [{reply,From,ok}]}; {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} @@ -314,8 +314,8 @@ end end; -state_authenticated({call, _From}, {swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_authenticated event=swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticated({call, _From}, {rx_swm_auth_req, PdpTypeNr, Apn, EAP}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; state_authenticated({call, From}, rx_swx_rtr, Data) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36304?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: I38f755c23d8b998adbb591e1178fa31245ae0ab4 Gerrit-Change-Number: 36304 Gerrit-PatchSet: 1 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 SWm Authorization Update towards ePDG
by pespin 15 Mar '24

15 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email ) Change subject: Propagate SWx PPR as SWm Authorization Update towards ePDG ...................................................................... Propagate SWx PPR as SWm Authorization Update towards ePDG With this commit ePDG is still not invoking the authorization procedure specified in 3GPP TS 29.273 7.1.2.2, but only ACKing the RAR message from 7.1.2.5. Related: OS#6404, OS#6400. Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb --- M src/aaa_diameter_swm.erl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 5 files changed, 147 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 9fa656e..c7c87a5 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -16,9 +16,14 @@ -export([rx_auth_request/4, rx_auth_compl_request/2, + rx_reauth_answer/2, rx_session_termination_request/1, rx_abort_session_answer/1]). --export([tx_auth_response/2, tx_auth_compl_response/2, tx_session_termination_answer/2, tx_as_request/1]). +-export([tx_auth_response/2, + tx_auth_compl_response/2, + tx_reauth_request/1, + tx_session_termination_answer/2, + tx_as_request/1]). -define(SERVER, ?MODULE). @@ -32,12 +37,16 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Tx over emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + tx_auth_response(Imsi, Result) -> _Result = gen_server:call(?SERVER, {epdg_auth_resp, Imsi, Result}). tx_auth_compl_response(Imsi, Result) -> _Result = gen_server:call(?SERVER, {epdg_auth_compl_resp, Imsi, Result}). +tx_reauth_request(Imsi) -> + _Result = gen_server:call(?SERVER, {rar, Imsi}). + tx_session_termination_answer(Imsi, Result) -> _Result = gen_server:call(?SERVER, {sta, Imsi, Result}). @@ -53,12 +62,17 @@ rx_auth_compl_request(Imsi, Apn) -> gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}). +rx_reauth_answer(Imsi, Result) -> + gen_server:cast(?SERVER, {raa, Imsi, Result}). + rx_session_termination_request(Imsi) -> gen_server:cast(?SERVER, {str, Imsi}). rx_abort_session_answer(Imsi) -> gen_server:cast(?SERVER, {asa, Imsi}). +%% handle_cast: Rx side + handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of undefined -> {ok, Pid} = aaa_ue_fsm:start(Imsi); @@ -77,6 +91,13 @@ end, {noreply, State}; +handle_cast({raa, Imsi, Result}, State) -> + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> aaa_ue_fsm:ev_rx_swm_reauth_answer(Pid, Result); + undefined -> ok + end, + {noreply, State}; + handle_cast({str, Imsi}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> @@ -111,6 +132,7 @@ error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. +%% handle_call: Tx side handle_call({epdg_auth_resp, Imsi, Result}, _From, State) -> epdg_diameter_swm:rx_auth_response(Imsi, Result), {reply, ok, State}; @@ -119,6 +141,10 @@ epdg_diameter_swm:rx_auth_compl_response(Imsi, Result), {reply, ok, State}; +handle_call({rar, Imsi}, _From, State) -> + epdg_diameter_swm:rx_reauth_request(Imsi), + {reply, ok, State}; + handle_call({sta, Imsi, DiaRC}, _From, State) -> epdg_diameter_swm:rx_session_termination_answer(Imsi, DiaRC), {reply, ok, State}; diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 93335a2..99d2ba3 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -81,14 +81,8 @@ 'Non-3GPP-User-Data' = N3UAopt} = Req, case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - _PGWAddresses = parse_pgw_addr_from_N3UA(N3UAopt), - %% TODO: in successful case, we want to validate how this prcoedure extends to other interfaces: - %% """ 3GPP TS 29.273 8.1.2.3.3: - %% After a successful user profile download, the 3GPP AAA Server shall - %% initiate re-authentication procedure as described - %% in clause 7.2.2.4 if the subscriber has previously been authenticated - %% and authorized to untrusted non-3GPP access. - %% """ + PGWAddresses = parse_pgw_addr_from_N3UA(N3UAopt), + aaa_ue_fsm:ev_rx_swx_ppr(Pid, {PGWAddresses}), Res = 2001, %% Success ERes = []; undefined -> diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 9ec6a00..b32d6c0 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,8 +42,8 @@ -export([start/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). --export([ev_rx_swm_auth_req/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_rtr/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]). -export([state_new/3, state_wait_swx_maa/3, @@ -94,6 +94,14 @@ exit:Err -> {error, Err} end. +ev_rx_swm_reauth_answer(Pid, Result) -> + lager:info("ue_fsm ev_rx_swm_reauth_answer~n", []), + try + gen_statem:call(Pid, {rx_swm_reauth_answer, Result}) + catch + exit:Err -> + {error, Err} + end. ev_rx_swm_auth_compl(Pid, Apn) -> lager:info("ue_fsm ev_rx_swm_auth_compl~n", []), @@ -140,6 +148,15 @@ {error, Err} end. +ev_rx_swx_ppr(Pid, PGWAddresses) -> + lager:info("ue_fsm ev_rx_swx_ppr~n", []), + try + gen_statem:call(Pid, {rx_swx_ppr, PGWAddresses}) + catch + exit:Err -> + {error, Err} + end. + ev_rx_swx_rtr(Pid) -> lager:info("ue_fsm ev_rx_swx_rtr~n", []), try @@ -318,6 +335,21 @@ lager:info("ue_fsm state_authenticated event=rx_swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; +state_authenticated({call, From}, {rx_swx_ppr, _PGWAddresses}, Data) -> + %% 3GPP TS 29.273 8.1.2.3.3: + %% 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; + +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_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 diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index c060d17..d78407c 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -5,6 +5,7 @@ -behaviour(gen_server). -include_lib("diameter_3gpp_ts29_273_swx.hrl"). +-include("conv.hrl"). -record(swm_state, { sessions = sets:new() @@ -20,11 +21,13 @@ -export([code_change/3, terminate/2]). -export([tx_auth_request/4, + tx_reauth_answer/2, tx_auth_compl_request/2, tx_session_termination_request/1, tx_abort_session_answer/1]). -export([rx_auth_response/2, rx_auth_compl_response/2, + rx_reauth_request/1, rx_session_termination_answer/2, rx_abort_session_request/1]). @@ -54,6 +57,11 @@ _ -> Result end. +tx_reauth_answer(Imsi, DiaRC) -> + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + _Result = gen_server:call(?SERVER, {raa, ImsiStr, DiaRC}). + % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": tx_auth_compl_request(Imsi, Apn) -> % In Diameter we use Imsi as strings, as done by diameter module. @@ -95,6 +103,11 @@ ok = aaa_diameter_swm:rx_auth_request(Imsi, PdpTypeNr, Apn, EAP), {reply, ok, State1}; +handle_call({raa, Imsi, DiaRC}, _From, State) -> + % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: + aaa_diameter_swm:rx_reauth_answer(Imsi, DiaRC#epdg_dia_rc.result_code), + {reply, ok, State}; + handle_call({epdg_auth_compl_req, Imsi, Apn}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: Sess = find_swm_session_by_imsi(Imsi, State), @@ -148,6 +161,25 @@ end, {noreply, State}; +handle_cast({rar, Imsi}, State) -> + Sess = find_swm_session_by_imsi(Imsi, State), + case Sess of + #swm_session{imsi = Imsi} -> + case epdg_ue_fsm:received_swm_reauth_request(Sess#swm_session.pid) of + ok -> + DiaResultCode = 2001, %% SUCCESS + aaa_diameter_swm:rx_reauth_answer(Imsi, DiaResultCode); + _ -> + DiaResultCode = 5012, %% UNABLE_TO_COMPLY + aaa_diameter_swm:rx_reauth_answer(Imsi, DiaResultCode) + end; + undefined -> + lager:notice("SWm Rx AAR: unknown swm-session ~p", [Imsi]), + DiaResultCode = 5002, %% UNKNOWN_SESSION_ID + aaa_diameter_swm:rx_reauth_answer(Imsi, DiaResultCode) + end, + {noreply, State}; + handle_cast({sta, Imsi, Result}, State) -> Sess = find_swm_session_by_imsi(Imsi, State), case Sess of @@ -186,6 +218,10 @@ lager:info("terminating ~p with reason ~p~n", [?MODULE, Reason]). %% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: +rx_reauth_request(Imsi) -> + ok = gen_server:cast(?SERVER, {rar, Imsi}). + +%% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: rx_auth_response(Imsi, Result) -> ok = gen_server:cast(?SERVER, {epdg_auth_resp, Imsi, Result}). diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 6b6f756..b75a865 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -44,7 +44,7 @@ -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([auth_request/2, lu_request/1, tunnel_request/2, purge_ms_request/1, cancel_location_result/1]). --export([received_swm_auth_response/2, received_swm_auth_compl_response/2, +-export([received_swm_reauth_request/1, received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2, received_swm_abort_session_request/1]). -export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2, received_gtpc_delete_bearer_request/1]). -export([state_new/3, @@ -137,6 +137,15 @@ {error, Err} end. +received_swm_reauth_request(Pid) -> + lager:info("ue_fsm received_swm_reauth_request~n", []), + try + gen_statem:call(Pid, received_swm_reauth_request) + catch + exit:Err -> + {error, Err} + end. + received_swm_auth_response(Pid, Result) -> lager:info("ue_fsm received_swm_auth_response ~p~n", [Result]), try @@ -327,6 +336,18 @@ Data#ue_fsm_data.pgw_rem_addr_list), {next_state, state_wait_create_session_resp, Data, [{reply,From,ok}]}; +state_authenticated({call, From}, received_swm_reauth_request, Data) -> + lager:info("ue_fsm state_authenticated event=received_swm_reauth_request, ~p~n", [Data]), + % TODO: 3GPP TS 29.273 7.1.2.5.1: + % Upon receiving the re-authorization request, the ePDG shall immediately invoke the authorization procedure + % specified in 7.1.2.2 for the session indicated in the request. This procedure is based on the Diameter + % commands AA-Request (AAR) and AA-Answer (AAA) specified in IETF RFC 4005 [4]. Information + % element contents for these messages are shown in tables 7.1.2.2.1/1 and 7.1.2.2.1/2. + % + % This is done synchronously for now when returning from call: + %%epdg_diameter_swm:tx_reauth_answer(Data#ue_fsm_data.imsi, #epdg_dia_rc{result_code = 2001}), + {keep_state, Data, [{reply,From,ok}]}; + state_authenticated({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_authenticated event=purge_ms_request, ~p~n", [Data]), Data1 = Data#ue_fsm_data{tear_down_gsup_needed = true}, @@ -396,6 +417,18 @@ Data1 = Data#ue_fsm_data{tun_pdp_ctx = undefined}, {next_state, state_new, Data1, [postpone]}; +state_active({call, From}, received_swm_reauth_request, Data) -> + lager:info("ue_fsm state_active event=received_swm_reauth_request, ~p~n", [Data]), + % TODO: 3GPP TS 29.273 7.1.2.5.1: + % Upon receiving the re-authorization request, the ePDG shall immediately invoke the authorization procedure + % specified in 7.1.2.2 for the session indicated in the request. This procedure is based on the Diameter + % commands AA-Request (AAR) and AA-Answer (AAA) specified in IETF RFC 4005 [4]. Information + % element contents for these messages are shown in tables 7.1.2.2.1/1 and 7.1.2.2.1/2. + % + % This is done synchronously for now when returning from call: + %%epdg_diameter_swm:tx_reauth_answer(Data#ue_fsm_data.imsi, #epdg_dia_rc{result_code = 2001}), + {keep_state, Data, [{reply,From,ok}]}; + state_active({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_active event=purge_ms_request, ~p~n", [Data]), gtp_u_tun:delete_pdp_context(Data#ue_fsm_data.tun_pdp_ctx), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?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: I4fe309ac54c61f134dbd471486c7d1a70731c9bb Gerrit-Change-Number: 36305 Gerrit-PatchSet: 4 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

[S] Change in ...osmo-epdg[master]: dia/diameter_3gpp_ts29_273_s6b.dia: Fix missing whitespace
by pespin 15 Mar '24

15 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36306?usp=email ) Change subject: dia/diameter_3gpp_ts29_273_s6b.dia: Fix missing whitespace ...................................................................... dia/diameter_3gpp_ts29_273_s6b.dia: Fix missing whitespace Change-Id: I88a86a3c435d93e21b5ac88a55349ed65bdd2e98 --- M dia/diameter_3gpp_ts29_273_s6b.dia 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/dia/diameter_3gpp_ts29_273_s6b.dia b/dia/diameter_3gpp_ts29_273_s6b.dia index 5468458..6b46171 100644 --- a/dia/diameter_3gpp_ts29_273_s6b.dia +++ b/dia/diameter_3gpp_ts29_273_s6b.dia @@ -154,7 +154,7 @@ { Auth-Application-Id } { Re-Auth-Request-Type } [ User-Name ] - [RAR-Flags ] + [ RAR-Flags ] *[ AVP ] ;; 9.2.2.6.2 Re-Auth-Answer (RAA) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36306?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: I88a86a3c435d93e21b5ac88a55349ed65bdd2e98 Gerrit-Change-Number: 36306 Gerrit-PatchSet: 1 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

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: Separate states using comment blocks
by pespin 15 Mar '24

15 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36302?usp=email ) Change subject: aaa_ue_fsm: Separate states using comment blocks ...................................................................... aaa_ue_fsm: Separate states using comment blocks As we add more and more states, it becomes difficult to visualize each state, its logic and why is it use. Add a comment block at the start of each one to clearly see the functions forming it, and allow writing some state description in it. Change-Id: Iae7cb9f2047f8265f52337452af51f8f86fadd65 --- M src/aaa_ue_fsm.erl 1 file changed, 42 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 907d8df..e87579f 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -196,6 +196,10 @@ lager:info("terminating ~p with reason ~p state=~p, ~p~n", [?MODULE, Reason, State, Data]), ok. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_new: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_new(enter, _OldState, Data) -> {keep_state, Data}; @@ -217,6 +221,10 @@ {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_swx_maa: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_swx_maa(enter, _OldState, Data) -> {keep_state, Data}; @@ -225,6 +233,10 @@ aaa_diameter_swm:auth_response(Data#ue_fsm_data.imsi, Result), {next_state, state_new, Data, [{reply,From,ok}]}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_wait_swx_saa: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_wait_swx_saa(enter, _OldState, Data) -> {keep_state, Data}; @@ -239,6 +251,10 @@ {next_state, state_authenticated, Data, [{reply,From,ok}]} end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_authenticated: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_authenticated(enter, _OldState, Data) -> % Mark ePDG session as active: Data1 = Data#ue_fsm_data{epdg_sess_active = true}, @@ -313,6 +329,10 @@ lager:info("ue_fsm state_authenticated: Unexpected call event ~p, ~p~n", [Ev, Data]), {keep_state, Data, [{reply,From,ok}]}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_authenticated_wait_swx_saa: +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_authenticated_wait_swx_saa(enter, _OldState, Data) -> {keep_state, Data}; @@ -340,8 +360,12 @@ end end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_dereg_net_initiated_wait_s6b_asa: %% HSS asked us to do deregistration towards the user. %% Transmit S6b ASR towards PGW and wait for ASA back. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_dereg_net_initiated_wait_s6b_asa(enter, _OldState, Data) -> aaa_diameter_s6b:tx_as_request(Data#ue_fsm_data.nai), {keep_state, Data, {state_timeout,?TIMEOUT_VAL_WAIT_S6b_ANSWER,s6b_asa_timeout}}; @@ -356,8 +380,12 @@ state_dereg_net_initiated_wait_s6b_asa(state_timeout, s6b_asa_timeout, Data) -> {next_state, state_dereg_net_initiated_wait_swm_asa, Data}. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% state_dereg_net_initiated_wait_s6b_asa: %% HSS asked us to do deregistration towards the user. %% S6b (PGW) was already torn down. Now transmit SWm ASR towards ePDG and wait for ASA back. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + state_dereg_net_initiated_wait_swm_asa(enter, _OldState, Data) -> aaa_diameter_swm:tx_as_request(Data#ue_fsm_data.imsi), {keep_state, Data, {state_timeout,?TIMEOUT_VAL_WAIT_SWm_ANSWER,swm_asa_timeout}}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36302?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: Iae7cb9f2047f8265f52337452af51f8f86fadd65 Gerrit-Change-Number: 36302 Gerrit-PatchSet: 1 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

2026

2025

2024

2023

2022

gerrit-log