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

[S] Change in libosmocore[master]: osmo_io: Guard osmo_iofd_register() with invalid file descriptor

by pespin

Attention is currently required from: daniel, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36188?usp=email ) Change subject: osmo_io: Guard osmo_iofd_register() with invalid file descriptor ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36188/comment/dc5c9ce7_fb0c29bf PS1, Line 676: if (iofd->fd < 0) { this is "else" clause for if just immediately above it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie4561cefad82e1bf5d37dd1a4815f4bc805343e6 Gerrit-Change-Number: 36188 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 12:05:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Log error message in case call-backs incompatible with mode

by pespin

Attention is currently required from: daniel, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36190?usp=email ) Change subject: osmo_io: Log error message in case call-backs incompatible with mode ...................................................................... Patch Set 2: (2 comments) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36190/comment/9e09a831_a941fa42 PS2, Line 623: LOGP(DLIO, LOGL_ERROR, "iofd(%s): rejecting call-backs incompatible with mode\n", ...with mode %u", mode https://gerrit.osmocom.org/c/libosmocore/+/36190/comment/4898f4d3_2ff28ab8 PS2, Line 876: LOGPIO(iofd, LOGL_ERROR, "rejecting call-backs incompatible with mode\n"); same -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36190?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50ba6a76c0144f249d67488874a6c4edf01ec6f2 Gerrit-Change-Number: 36190 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 12:03:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Templates: tr_GSUP_SAI_ERR: Allow passing extra params like MSG_...

by fixeria

Attention is currently required from: laforge, lynxis lazus, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36179?usp=email ) Change subject: GSUP_Templates: tr_GSUP_SAI_ERR: Allow passing extra params like MSG_CLASS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36179?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I817b079ed380514e067bda1e7f3f7c6177ef314b Gerrit-Change-Number: 36179 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 07 Mar 2024 12:03:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Forward failure SWx MAA -> GSUP AuthInfo Error

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36180?usp=email ) Change subject: Forward failure SWx MAA -> GSUP AuthInfo Error ...................................................................... Forward failure SWx MAA -> GSUP AuthInfo Error Change-Id: I48066058e601a4ca4d46e239f7a7060bbc20a32b --- M include/conv.hrl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/conv.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 6 files changed, 104 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/conv.hrl b/include/conv.hrl index 80b7e5b..786bdff 100644 --- a/include/conv.hrl +++ b/include/conv.hrl @@ -31,6 +31,12 @@ % -hrl_name('conv.hrl'). +%% Can Hold information about Result-Code or Experimental-Result: +-record(epdg_dia_rc, { + vendor_id :: non_neg_integer(), %% or undefined if Result-Code + result_code :: non_neg_integer() +}). + -record(epdg_eua, { type_nr :: non_neg_integer(), ipv4 :: binary(), diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 0457259..8a6dd08 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -70,18 +70,27 @@ %% handle_answer/4 handle_answer(#diameter_packet{msg = Msg, errors = Errors}, _Request, _SvcName, Peer, ReqPid) when is_record(Msg, 'MAA') -> lager:info("SWx Rx MAA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), - #'MAA'{'SIP-Auth-Data-Item' = SipAuthTuples} = Msg, - AuthTuples = lists:map(fun dia_sip2epdg_auth_tuple/1, SipAuthTuples), - % TODO: handle error case.... - aaa_ue_fsm:ev_rx_swx_maa(ReqPid, {ok, AuthTuples}), + #'MAA'{'Result-Code' = ResultCodeOpt, + 'Experimental-Result' = ExperimentalResultOpt} = Msg, + DiaRC = parse_epdg_dia_rc(ResultCodeOpt, ExperimentalResultOpt), + case dia_rc_success(DiaRC) of + ok -> + #'MAA'{'SIP-Auth-Data-Item' = SipAuthTuples} = Msg, + AuthTuples = lists:map(fun dia_sip2epdg_auth_tuple/1, SipAuthTuples), + aaa_ue_fsm:ev_rx_swx_maa(ReqPid, {ok, AuthTuples}); + _ -> + aaa_ue_fsm:ev_rx_swx_maa(ReqPid, {error, DiaRC}) + end, {ok, Msg}; handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer, ReqPid) when is_record(Msg, 'SAA') -> lager:info("SWx Rx SAA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), % Recover fields from originating request: #'SAR'{'Server-Assignment-Type' = SAType} = Request, % Retrieve fields from answer: - #'SAA'{'Result-Code' = [ResultCode]} = Msg, - case result_code_success(ResultCode) of + #'SAA'{'Result-Code' = ResultCodeOpt, + 'Experimental-Result' = ExperimentalResultOpt} = Msg, + DiaRC = parse_epdg_dia_rc(ResultCodeOpt, ExperimentalResultOpt), + case dia_rc_success(DiaRC) of ok -> #'SAA'{'Non-3GPP-User-Data' = N3UA} = Msg, PGWAddresses = parse_pgw_addr_from_N3UA(N3UA), @@ -91,7 +100,7 @@ end, aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {ok, SAType, ResInfo}); _ -> - aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {error, SAType, ResultCode}) + aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {error, SAType, DiaRC}) end, {ok, Msg}. handle_answer(#diameter_packet{msg = Msg, errors = []}, _Request, _SvcName, Peer) -> @@ -121,9 +130,19 @@ %% Internal Function Definitions %% ------------------------------------------------------------------ -result_code_success(2001) -> ok; -result_code_success(2002) -> ok; -result_code_success(_) -> invalid_result_code. +dia_rc_success(#epdg_dia_rc{result_code = 2001}) -> ok; +dia_rc_success(#epdg_dia_rc{result_code = 2002}) -> ok; +dia_rc_success(_) -> invalid_result_code. + +parse_epdg_dia_rc([], []) -> + #epdg_dia_rc{vendor_id = undefined, result_code = 2001 }; +parse_epdg_dia_rc([ResultCode], []) -> + #epdg_dia_rc{vendor_id = undefined, result_code = ResultCode }; +parse_epdg_dia_rc([], [ExpResultCode]) -> + #'Experimental-Result'{'Vendor-Id' = VendorId, 'Experimental-Result-Code' = ERC} = ExpResultCode, + #epdg_dia_rc{vendor_id = VendorId, result_code = ERC }; +parse_epdg_dia_rc([ResultCode], [_ExpResultCode]) -> + parse_epdg_dia_rc([ResultCode], []). dia_sip2epdg_auth_tuple(#'SIP-Auth-Data-Item'{'SIP-Authenticate' = [Authenticate], 'SIP-Authorization' = [Authorization], diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 9e41756..ae7de6b 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -37,6 +37,7 @@ -include_lib("diameter/include/diameter.hrl"). -include_lib("diameter_3gpp_ts29_229.hrl"). -include_lib("diameter_3gpp_ts29_273_s6b.hrl"). +-include("conv.hrl"). -export([start_link/1]). -export([init/1,callback_mode/0,terminate/3]). @@ -175,7 +176,6 @@ state_wait_swx_maa({call, From}, {rx_swx_maa, Result}, Data) -> lager:info("ue_fsm state_wait_swx_maa event=rx_swx_maa, ~p~n", [Data]), aaa_diameter_swm:auth_response(Data#ue_fsm_data.imsi, Result), - % TODO: don't transit if SAS returned error code. {next_state, state_new, Data, [{reply,From,ok}]}. state_wait_swx_saa(enter, _OldState, Data) -> @@ -184,8 +184,8 @@ state_wait_swx_saa({call, From}, {rx_swx_saa, Result}, Data) -> lager:info("ue_fsm state_wait_swx_saa event=rx_swx_saa ~p, ~p~n", [Result, Data]), case Result of - {error, _SAType, ResultCode} -> - aaa_diameter_swm:auth_compl_response(Data#ue_fsm_data.imsi, {error, ResultCode}), + {error, _SAType, DiaRC} -> + aaa_diameter_swm:auth_compl_response(Data#ue_fsm_data.imsi, {error, DiaRC}), {next_state, state_new, Data, [{reply,From,ok}]}; {ok, _SAType, ResInfo} -> aaa_diameter_swm:auth_compl_response(Data#ue_fsm_data.imsi, {ok, ResInfo}), @@ -263,7 +263,7 @@ state_authenticated_wait_swx_saa({call, From}, {rx_swx_saa, Result}, Data) -> case Result of - {error, SAType, ResultCode} -> ResultCode; + {error, SAType, DiaRC} -> ResultCode = DiaRC#epdg_dia_rc.result_code; {ok, SAType, _ResInfo} -> ResultCode = 2001 end, lager:info("ue_fsm state_authenticated_wait_swx_saa event=rx_swx_saa SAType=~p ResulCode=~p, ~p~n", [SAType, ResultCode, Data]), diff --git a/src/conv.erl b/src/conv.erl index cdba445..1a15a3c 100644 --- a/src/conv.erl +++ b/src/conv.erl @@ -40,6 +40,7 @@ -export([ip_to_bin/1, bin_to_ip/1]). -export([cause_gtp2gsup/1]). +-export([dia_rc_to_gsup_cause/1]). -export([gtp2_paa_to_epdg_eua/1, epdg_eua_to_gsup_pdp_address/1]). -export([nai_to_imsi/1]). @@ -76,6 +77,32 @@ cause_gtp2gsup(_) -> ?GSUP_CAUSE_PROTO_ERR_UNSPEC. +-define(DIA_VENDOR_3GPP, 10415). +% transient (only in Experimental-Result-Code) +-define(DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE, 4181). +-define(DIAMETER_ERROR_CAMEL_SUBSCRIPTION_PRESENT, 4182). +% permanent (only in Experimental-Result-Code) +-define(DIAMETER_ERROR_USER_UNKNOWN, 5001). +-define(DIAMETER_AUTHORIZATION_REJECTED, 5003). +-define(DIAMETER_ERROR_ROAMING_NOT_ALLOWED, 5004). +-define(DIAMETER_MISSING_AVP, 5005). +-define(DIAMETER_UNABLE_TO_COMPLY, 5012). +-define(DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION, 5420). +-define(DIAMETER_ERROR_RAT_NOT_ALLOWED, 5421). +-define(DIAMETER_ERROR_EQUIPMENT_UNKNOWN, 5422). +-define(DIAMETER_ERROR_UNKOWN_SERVING_NODE, 5423). + +-spec dia_rc_to_gsup_cause(#epdg_dia_rc{}) -> non_neg_integer(). +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = 2001}) -> 0; +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = 2002}) -> 0; +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = ?DIAMETER_ERROR_USER_UNKNOWN}) -> ?GSUP_CAUSE_IMSI_UNKNOWN; +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = ?DIAMETER_AUTHORIZATION_REJECTED}) -> ?GSUP_CAUSE_LA_NOTALLOWED; +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = ?DIAMETER_ERROR_ROAMING_NOT_ALLOWED}) -> ?GSUP_CAUSE_ROAMING_NOTALLOWED; +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = ?DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION}) -> ?GSUP_CAUSE_NO_SUIT_CELL_IN_LA; +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = ?DIAMETER_UNABLE_TO_COMPLY}) -> ?GSUP_CAUSE_NET_FAIL; +dia_rc_to_gsup_cause(#epdg_dia_rc{result_code = ?DIAMETER_MISSING_AVP}) -> ?GSUP_CAUSE_PROTO_ERR_UNSPEC; +dia_rc_to_gsup_cause(_) -> ?GSUP_CAUSE_NET_FAIL. + gtp2_paa_to_epdg_eua(#v2_pdn_address_allocation{type = ipv4, address = Addr}) -> #epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, ipv4 = Addr}; diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 703e242..1414190 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -218,12 +218,14 @@ state_wait_auth_resp({call, From}, {received_swm_auth_response, Result}, Data) -> lager:info("ue_fsm state_wait_auth_resp event=received_swm_auth_response Result=~p, ~p~n", [Result, Data]), - gsup_server:auth_response(Data#ue_fsm_data.imsi, Result), case Result of - {ok, _} -> + {ok, _AuthTuples} -> + gsup_server:auth_response(Data#ue_fsm_data.imsi, Result), {next_state, state_authenticating, Data, [{reply,From,ok}]}; - {error, Err} -> - {next_state, state_new, Data, [{reply,From,{error,Err}}]}; + {error, DiaRC} -> + GsupCause = conv:dia_rc_to_gsup_cause(DiaRC), + gsup_server:auth_response(Data#ue_fsm_data.imsi, {error, GsupCause}), + {next_state, state_new, Data, [{reply,From,ok}]}; _ -> {next_state, state_new, Data, [{reply,From,{error,unknown}}]} end. @@ -257,13 +259,12 @@ PGWAddrCandidateList -> Data1 = Data#ue_fsm_data{pgw_rem_addr_list = PGWAddrCandidateList} end, - Ret = ok, - gsup_server:lu_response(Data1#ue_fsm_data.imsi, Ret), - {next_state, state_authenticated, Data1, [{reply,From,Ret}]}; - {error, Err} -> - Ret = {error, Err}, - gsup_server:lu_response(Data#ue_fsm_data.imsi, Ret), - {next_state, state_new, Data, [{reply,From,Ret}]} + gsup_server:lu_response(Data1#ue_fsm_data.imsi, ok), + {next_state, state_authenticated, Data1, [{reply,From,ok}]}; + {error, DiaRC} -> + GsupCause = conv:dia_rc_to_gsup_cause(DiaRC), + gsup_server:lu_response(Data#ue_fsm_data.imsi, {error, GsupCause}), + {next_state, state_new, Data, [{reply,From,ok}]} end. state_authenticated(enter, _OldState, Data) -> diff --git a/src/gsup_server.erl b/src/gsup_server.erl index d71836b..10495e1 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -122,7 +122,12 @@ imsi => Imsi, auth_tuples => lists:map(fun epdg_auth_tuple2gsup/1, AuthTuples) }; - {error, _} -> Resp = #{message_type => send_auth_info_err, imsi => Imsi, message_class => 5, cause => ?GSUP_CAUSE_NET_FAIL} + {error, Gsupcause} -> + Resp = #{message_type => send_auth_info_err, + imsi => Imsi, + message_class => 5, + cause => Gsupcause + } end, tx_gsup(Socket, Resp), {noreply, State}; @@ -131,15 +136,17 @@ lager:info("lu_response for ~p: ~p~n", [Imsi, Result]), Socket = State#gsups_state.socket, case Result of - ok -> Resp = #{message_type => location_upd_res, - imsi => Imsi, - message_class => 5 - }; - {error, _} -> Resp = #{message_type => location_upd_err, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_NET_FAIL - } + ok -> + Resp = #{message_type => location_upd_res, + imsi => Imsi, + message_class => 5 + }; + {error, Gsupcause} -> + Resp = #{message_type => location_upd_err, + imsi => Imsi, + message_class => 5, + cause => Gsupcause + } end, tx_gsup(Socket, Resp), {noreply, State}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36180?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: I48066058e601a4ca4d46e239f7a7060bbc20a32b Gerrit-Change-Number: 36180 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: Fix format error during log

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36181?usp=email ) Change subject: aaa_ue_fsm: Fix format error during log ...................................................................... aaa_ue_fsm: Fix format error during log Change-Id: Id57156dfb5de0cddf6fb42def5c312c85dff09f8 --- M src/aaa_ue_fsm.erl 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index ae7de6b..4c33567 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -122,7 +122,7 @@ end. ev_rx_s6b_str(Pid) -> - lager:info("ue_fsm ev_rx_s6b_str: ~p~n", []), + lager:info("ue_fsm ev_rx_s6b_str~n", []), try gen_statem:call(Pid, rx_s6b_str) catch -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36181?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: Id57156dfb5de0cddf6fb42def5c312c85dff09f8 Gerrit-Change-Number: 36181 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Migrate S6b to use new epdg_dia_rc record

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36182?usp=email ) Change subject: Migrate S6b to use new epdg_dia_rc record ...................................................................... Migrate S6b to use new epdg_dia_rc record Change-Id: I11674ef7b9fb541d7e48a74fa986ee0798042de9 --- M src/aaa_diameter_s6b.erl M src/aaa_diameter_s6b_cb.erl M src/aaa_ue_fsm.erl M src/epdg_ue_fsm.erl 4 files changed, 36 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index 2792b6a..163ffbd 100644 --- a/src/aaa_diameter_s6b.erl +++ b/src/aaa_diameter_s6b.erl @@ -147,13 +147,13 @@ gen_server:call(?SERVER, {sar, {IMSI, Type, APN}}). -tx_aa_answer(Pid, ResultCode) -> +tx_aa_answer(Pid, DiaRC) -> % handle_request(AAR) was spawned into its own process, and it's blocked waiting for AAA: - Pid ! {aaa, ResultCode}. + Pid ! {aaa, DiaRC}. -tx_st_answer(Pid, ResultCode) -> +tx_st_answer(Pid, DiaRC) -> % handle_request(STR) was spawned into its own process, and it's blocked waiting for STA: - Pid ! {sta, ResultCode}. + Pid ! {sta, DiaRC}. result_code_success(2001) -> ok; result_code_success(2002) -> ok; diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index b3fe209..a56a7ca 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -6,6 +6,8 @@ -include_lib("diameter/include/diameter.hrl"). -include_lib("diameter_3gpp_ts29_273_s6b.hrl"). +-include("conv.hrl"). + %% diameter callbacks -export([peer_up/3, peer_down/3, pick_peer/4, prepare_request/3, prepare_retransmit/3, handle_answer/4, handle_error/4, handle_request/3]). @@ -67,15 +69,15 @@ ok = aaa_ue_fsm:ev_rx_s6b_aar(PidRes, {Apn, AgentInfoOpt}), lager:debug("Waiting for S6b AAA~n", []), receive - {aaa, ResultCode} -> lager:debug("Rx AAA with ResultCode=~p~n", [ResultCode]) + {aaa, DiaRC} -> lager:debug("Rx AAA with DiaRC=~p~n", [DiaRC]) end; undefined -> lager:error("Error looking up FSM for IMSI~n", [Imsi]), - ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' + DiaRC = #epdg_dia_rc{result_code = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED'} end, Resp = #'AAA'{'Session-Id'= SessionId, 'Auth-Application-Id' = AuthAppId, 'Auth-Request-Type' = AuthReqType, - 'Result-Code' = ResultCode, + 'Result-Code' = DiaRC#epdg_dia_rc.result_code, 'Origin-Host' = OH, 'Origin-Realm' = OR}, lager:info("S6b Tx to ~p: ~p~n", [Caps, Resp]), @@ -97,10 +99,12 @@ ok -> lager:debug("Waiting for S6b STA~n", []), receive - {sta, ResultCode} -> lager:debug("Rx STA with ResultCode=~p~n", [ResultCode]) + {sta, DiaRC} -> + ResultCode = DiaRC#epdg_dia_rc.result_code, + lager:debug("Rx STA with ResultCode=~p~n", [ResultCode]) end; - {ok, DiaRC} when is_integer(DiaRC) -> - ResultCode = DiaRC; + {ok, DiaRC} -> + ResultCode = DiaRC#epdg_dia_rc.result_code; {error, Err} when is_integer(Err) -> ResultCode = Err; {error, _} -> @@ -119,4 +123,4 @@ handle_request(Packet, _SvcName, Peer) -> lager:error("S6b Rx unexpected msg from ~p: ~p~n", [Peer, Packet]), - erlang:error({unexpected, ?MODULE, ?LINE}). + erlang:error({unexpected, ?MODULE, ?LINE}). \ No newline at end of file diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 4c33567..f06b326 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -232,12 +232,13 @@ lager:info("ue_fsm state_authenticated event=rx_s6b_str, ~p~n", [Data]), case {Data#ue_fsm_data.pgw_sess_active, Data#ue_fsm_data.epdg_sess_active} of {false, _} -> %% The S6b session is not active... - DiaRC = 5002, %% UNKNOWN_SESSION_ID + DiaRC = #epdg_dia_rc{result_code = 5002}, %% UNKNOWN_SESSION_ID {keep_state, Data, [{reply,From,{error, DiaRC}}]}; {true, true} -> %% The other session is still active, no need to send SAR Type=USER_DEREGISTRATION lager:info("ue_fsm state_authenticated event=rx_s6b_str: ePDG session still active, skip updating the HSS~n", []), Data1 = Data#ue_fsm_data{pgw_sess_active = false}, - {keep_state, Data1, [{reply,From,{ok, 2001}}]}; + DiaRC = #epdg_dia_rc{result_code = 2001}, %% SUCCESS + {keep_state, Data1, [{reply,From,{ok, DiaRC}}]}; {true, false} -> %% All sessions will now be gone, trigger SAR Type=USER_DEREGISTRATION case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_USER_DEREGISTRATION', @@ -245,7 +246,7 @@ ok -> Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid}, {next_state, state_authenticated_wait_swx_saa, Data1, [{reply,From,ok}]}; {error, _Err} -> - DiaRC = 5002, %% UNKNOWN_SESSION_ID + DiaRC = #epdg_dia_rc{result_code = 5002}, %% UNKNOWN_SESSION_ID {keep_state, Data, [{reply,From,{error, DiaRC}}]} end end; @@ -263,23 +264,23 @@ state_authenticated_wait_swx_saa({call, From}, {rx_swx_saa, Result}, Data) -> case Result of - {error, SAType, DiaRC} -> ResultCode = DiaRC#epdg_dia_rc.result_code; - {ok, SAType, _ResInfo} -> ResultCode = 2001 + {error, SAType, DiaRC} -> DiaRC; + {ok, SAType, _ResInfo} -> DiaRC = #epdg_dia_rc{result_code = 2001} end, - lager:info("ue_fsm state_authenticated_wait_swx_saa event=rx_swx_saa SAType=~p ResulCode=~p, ~p~n", [SAType, ResultCode, Data]), + lager:info("ue_fsm state_authenticated_wait_swx_saa event=rx_swx_saa SAType=~p ResulCode=~p, ~p~n", [SAType, DiaRC, Data]), case SAType of ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE' -> - aaa_diameter_s6b:tx_aa_answer(Data#ue_fsm_data.s6b_resp_pid, ResultCode), + aaa_diameter_s6b:tx_aa_answer(Data#ue_fsm_data.s6b_resp_pid, DiaRC), Data1 = Data#ue_fsm_data{pgw_sess_active = true, s6b_resp_pid = undefined}, {next_state, state_authenticated, Data1, [{reply,From,ok}]}; ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_USER_DEREGISTRATION' -> case Data#ue_fsm_data.s6b_resp_pid of undefined -> %% SWm initiated - aaa_diameter_swm:session_termination_answer(Data#ue_fsm_data.imsi, ResultCode), + aaa_diameter_swm:session_termination_answer(Data#ue_fsm_data.imsi, DiaRC), Data1 = Data#ue_fsm_data{epdg_sess_active = false}, {next_state, state_new, Data1, [{reply,From,ok}]}; _ -> %% S6b initiated - aaa_diameter_s6b:tx_st_answer(Data#ue_fsm_data.s6b_resp_pid, ResultCode), + aaa_diameter_s6b:tx_st_answer(Data#ue_fsm_data.s6b_resp_pid, DiaRC), Data1 = Data#ue_fsm_data{pgw_sess_active = false, s6b_resp_pid = undefined}, {next_state, state_new, Data1, [{reply,From,ok}]} end diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 1414190..fd0d7f9 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -402,11 +402,11 @@ {keep_state, Data} end; -state_wait_swm_session_termination_answer({call, From}, {received_swm_sta, DiaResultCode}, Data) -> +state_wait_swm_session_termination_answer({call, From}, {received_swm_sta, DiaRC}, Data) -> lager:info("ue_fsm state_wait_swm_session_termination_answer event=received_swm_sta, ~p~n", [Data]), case Data#ue_fsm_data.tear_down_gsup_needed of true -> - case {DiaResultCode, Data#ue_fsm_data.tear_down_gsup_cause} of + case {DiaRC#epdg_dia_rc.result_code, Data#ue_fsm_data.tear_down_gsup_cause} of {2001, 0} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, ok); {2001, _} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, Data#ue_fsm_data.tear_down_gsup_cause}); _ -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36182?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: I11674ef7b9fb541d7e48a74fa986ee0798042de9 Gerrit-Change-Number: 36182 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Migrate S6b to use new epdg_dia_rc record

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36182?usp=email ) Change subject: Migrate S6b to use new epdg_dia_rc record ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36182?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: I11674ef7b9fb541d7e48a74fa986ee0798042de9 Gerrit-Change-Number: 36182 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 12:02:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: Fix format error during log

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36181?usp=email ) Change subject: aaa_ue_fsm: Fix format error during log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36181?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: Id57156dfb5de0cddf6fb42def5c312c85dff09f8 Gerrit-Change-Number: 36181 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 12:02:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Forward failure SWx MAA -> GSUP AuthInfo Error

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36180?usp=email ) Change subject: Forward failure SWx MAA -> GSUP AuthInfo Error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36180?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: I48066058e601a4ca4d46e239f7a7060bbc20a32b Gerrit-Change-Number: 36180 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 12:02:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-stp-test: enable M3UA-over-TCP testing for master

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36151?usp=email ) Change subject: ttcn3-stp-test: enable M3UA-over-TCP testing for master ...................................................................... ttcn3-stp-test: enable M3UA-over-TCP testing for master Change-Id: I210b7d62845075dcfe147f2f77603625cc1e64f9 Depends: osmo-ttcn3-hacks.git I5d0b05aa434c057ad379125ac293f5fc9a240b6f Related: osmo-ttcn3-hacks.git I1e2a887aa22f317783b3207494fd707d7b426439 Related: SYS#5424 --- M ttcn3-stp-test/jenkins.sh A ttcn3-stp-test/osmo-stp-tcp.confmerge 2 files changed, 47 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 006bb3b..f6768f0 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -16,6 +16,13 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +# XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 +if image_suffix_is_master; then + osmo-config-merge ./osmo-stp.cfg \ + ./osmo-stp-tcp.confmerge \ + > "$VOL_BASE_DIR/stp/osmo-stp.cfg" +fi + network_create network_replace_subnet_in_configs diff --git a/ttcn3-stp-test/osmo-stp-tcp.confmerge b/ttcn3-stp-test/osmo-stp-tcp.confmerge new file mode 100644 index 0000000..8772c35 --- /dev/null +++ b/ttcn3-stp-test/osmo-stp-tcp.confmerge @@ -0,0 +1,28 @@ +cs7 instance 0 + asp asp-sender-tcp 9999 2905 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + role sg + transport-role server + asp asp-client0-tcp 10002 2906 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + role asp + transport-role client + as as-sender-tcp m3ua + asp asp-sender-tcp + routing-key 1123 123 + as as-client-tcp m3ua + routing-key 1155 155 + asp asp-client0-tcp + route-table system + update route 123 16777215 linkset as-sender-tcp + update route 155 16777215 linkset as-client-tcp + listen m3ua 2905 tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I210b7d62845075dcfe147f2f77603625cc1e64f9 Gerrit-Change-Number: 36151 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024