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

[M] Change in ...osmo-epdg[master]: gsups_server: Monitor epdg_ue_fsm instead of linking it

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36176?usp=email ) Change subject: gsups_server: Monitor epdg_ue_fsm instead of linking it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36176?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: I96284aa8752d317cfb5f5c4565d7dea09e56171f Gerrit-Change-Number: 36176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Mar 2024 18:25:12 +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]: Avoid propagating full diameter Swx MAA message to epdg gsup module

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36173?usp=email ) Change subject: Avoid propagating full diameter Swx MAA message to epdg gsup module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36173?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: I4a787649cf970fc08e32cfb27e846598515482ef Gerrit-Change-Number: 36173 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-Comment-Date: Wed, 06 Mar 2024 18:25:09 +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

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36180?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: 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/80/36180/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-MessageType: newpatchset

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/81/36181/1 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-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/82/36182/1 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-MessageType: newchange

1 year, 5 months

1
0
0 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... Patch Set 9: Code-Review+1 (2 comments) File src/osmo_ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/35070/comment/ccf6a228_251a55c8 PS9, Line 867: if (rc < 0) { How is this supposed to happen now with osmo_io? It's still not clear to me. Scenarario is: we have a server-side SCTP/TCP ASP whose socket suddenly becomes death (eg. tcp timeout). Where are we getting this notification now? Where are we calling osmo_stream_srv_destroy()? AFAIU it's done through ss7_asp_xua_srv_conn_closed_cb(), but I don't see osmo_stream_srv_destroy() being called there. Is the call to osmo_stream_srv_destroy() done now automatically from within osmo_stream_srv? I'm not saying it's wrong, I just want to make sure we have no regressions here. File src/osmo_ss7_xua_srv.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/35070/comment/2c49a430_c2bfac37 PS9, Line 83: switch (oxs->cfg.proto) { (Not to be done now, but we should ideally move some of this logic to a new function in _asp.c since most of this is done on the srv object). -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 Gerrit-Change-Number: 35070 Gerrit-PatchSet: 9 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 06 Mar 2024 18:08:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... xua + ipa: Add support for I/O in OSMO_IO mode This switches osmo_stream_{cli,srv} over to using the OSMO_IO mode instead of the classic OSMO_FD mode. The difference is that we no longer read/write directly to a file descriptor, but we pass message buffers to/from the library. This in turn allows the library to use more efficient I/O mechanisms as osmo_io backend, for example the Linux kernel io_uring. Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 Depends: libosmo-netif.git I6cf5bad5f618e71c80017960c38009b089dbd6a1 Depends: libosmocore.git I89eb519b22d21011d61a7855b2364bc3c295df82 Closes: OS#5752 --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 4 files changed, 92 insertions(+), 232 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 7785711..0c3e87e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -17,3 +17,4 @@ libosmo-sigtran API added osmo_ss7_asp_get_trans_proto() libosmo-sigtran API added osmo_ss7_asp_{find2,find_or_create2}() libosmo-sigtran API added osmo_ss7_xua_server_{find2,create2}() +libosmo-netif >1.4.0 osmo_io SCTP support diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 5bab5ff..c5a2fc5 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -601,10 +601,11 @@ talloc_free(asp); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn); -static int ipa_cli_read_cb(struct osmo_stream_cli *conn); -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn); +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); static int xua_cli_connect_cb(struct osmo_stream_cli *cli); +static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp) { @@ -642,22 +643,27 @@ osmo_stream_cli_set_proto(asp->client, asp->cfg.trans_proto); osmo_stream_cli_set_reconnect_timeout(asp->client, 5); osmo_stream_cli_set_connect_cb(asp->client, xua_cli_connect_cb); + osmo_stream_cli_set_disconnect_cb(asp->client, xua_cli_close_and_reconnect); switch (asp->cfg.proto) { case OSMO_SS7_ASP_PROT_IPA: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_TCP); - osmo_stream_cli_set_read_cb(asp->client, ipa_cli_read_cb); + osmo_stream_cli_set_read_cb2(asp->client, ipa_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, osmo_ipa_segmentation_cb); break; case OSMO_SS7_ASP_PROT_M3UA: - if (asp->cfg.trans_proto == IPPROTO_SCTP) - osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); - else if (asp->cfg.trans_proto == IPPROTO_TCP) - osmo_stream_cli_set_read_cb(asp->client, m3ua_tcp_cli_read_cb); - else + if (asp->cfg.trans_proto == IPPROTO_SCTP) { + osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, NULL); + } else if (asp->cfg.trans_proto == IPPROTO_TCP) { + osmo_stream_cli_set_read_cb2(asp->client, m3ua_tcp_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, xua_tcp_segmentation_cb); + } else OSMO_ASSERT(0); break; default: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_SCTP); - osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, NULL); break; } osmo_stream_cli_set_data(asp->client, asp); @@ -789,33 +795,11 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = NULL; - int rc; - OSMO_ASSERT(fd >= 0); - - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - osmo_stream_srv_destroy(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - osmo_stream_srv_destroy(conn); - msgb_free(msg); - return -1; - } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -824,19 +808,14 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Server Rx"); unsigned int ppid; int flags; - int rc; + int rc = 0; - if (!msg) - return -ENOMEM; - - /* read xUA message from socket and process it */ - rc = osmo_stream_srv_recv(conn, msg); + /* process the received xUA message */ flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", @@ -855,22 +834,6 @@ default: break; } - - if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - } else { - rc = 0; - } - goto out; - } - if (rc < 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; goto out; } @@ -890,73 +853,38 @@ return rc; } -/* netif code tells us we can read something from the socket */ -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn) +int xua_tcp_segmentation_cb(struct msgb *msg) { - struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - int fd = osmo_stream_srv_get_fd(conn); - struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; size_t msg_length; - int rc; - OSMO_ASSERT(fd >= 0); + if (msgb_length(msg) < sizeof(*hdr)) + return -EAGAIN; - if (msg == NULL) { - msg = m3ua_msgb_alloc(__func__); - asp->pending_msg = msg; - } - - /* read message header first */ - if (msg->len < sizeof(*hdr)) { - errno = 0; - rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - osmo_stream_srv_destroy(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < sizeof(*hdr)) - return 0; /* need more data */ - } - - hdr = (const struct xua_common_hdr *)msg->data; + hdr = (const struct xua_common_hdr *) msg->data; msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ - /* read the rest of the message */ - if (msg->len < msg_length) { - errno = 0; - rc = recv(fd, msg->tail, msg_length - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - osmo_stream_srv_destroy(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } + return msg_length; +} - msgb_put(msg, rc); - if (msg->len < msg_length) - return 0; /* need more data */ - } +/* netif code tells us we can read something from the socket */ +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +{ + struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + const struct xua_common_hdr *hdr; + int rc; msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* spoof SCTP Stream ID */ + hdr = (const struct xua_common_hdr *)msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; rc = m3ua_rx_msg(asp, msg); - asp->pending_msg = NULL; msgb_free(msg); return rc; @@ -1009,40 +937,19 @@ xua_asp_send_xlm_prim_simple(asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_INDICATION); } -static void xua_cli_close_and_reconnect(struct osmo_stream_cli *cli) +static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli) { xua_cli_close(cli); osmo_stream_cli_reconnect(cli); + return 0; } /* read call-back for IPA/SCCPlite socket */ -static int ipa_cli_read_cb(struct osmo_stream_cli *conn) +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { int fd = osmo_stream_cli_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = NULL; - int rc; - OSMO_ASSERT(fd >= 0); - - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - xua_cli_close_and_reconnect(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - xua_cli_close_and_reconnect(conn); - msgb_free(msg); - return -1; - } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -1051,94 +958,34 @@ } /* read call-back for M3UA-over-TCP socket */ -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn) +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { - struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - int fd = osmo_stream_cli_get_fd(conn); - struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; - size_t msg_length; - int rc; - OSMO_ASSERT(fd >= 0); - - if (msg == NULL) { - msg = m3ua_msgb_alloc(__func__); - asp->pending_msg = msg; - } - - /* read message header first */ - if (msg->len < sizeof(*hdr)) { - errno = 0; - rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - xua_cli_close_and_reconnect(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < sizeof(*hdr)) - return 0; /* need more data */ - } - - hdr = (const struct xua_common_hdr *)msg->data; - msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ - - /* read the rest of the message */ - if (msg->len < msg_length) { - errno = 0; - rc = recv(fd, msg->tail, msg_length - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - xua_cli_close_and_reconnect(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < msg_length) - return 0; /* need more data */ - } - - msg->dst = asp; - rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); + /* spoof SCTP PPID */ + msgb_sctp_ppid(msg) = M3UA_PPID; /* spoof SCTP Stream ID */ + hdr = (const struct xua_common_hdr *) msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; - rc = m3ua_rx_msg(asp, msg); - asp->pending_msg = NULL; - msgb_free(msg); - - return rc; + return xua_cli_read_cb(conn, msg); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn) +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Client Rx"); unsigned int ppid; int flags; int rc; - if (!msg) - return -ENOMEM; - - /* read xUA message from socket and process it */ - rc = osmo_stream_cli_recv(conn, msg); flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", - __func__, rc, flags); + __func__, msgb_length(msg), flags); if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); @@ -1153,17 +1000,6 @@ default: break; } - - if (rc == 0) - xua_cli_close_and_reconnect(conn); - rc = 0; - goto out; - } - if (rc < 0) { - xua_cli_close_and_reconnect(conn); - goto out; - } else if (rc == 0) { - xua_cli_close_and_reconnect(conn); goto out; } diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 6da7b7a..e8e01b3 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -67,32 +67,11 @@ struct osmo_ss7_asp *asp; char *sock_name = osmo_sock_get_name(link, fd); const char *proto_name = get_value_string(osmo_ss7_asp_protocol_vals, oxs->cfg.proto); - int (*read_cb)(struct osmo_stream_srv *conn) = NULL; int rc = 0; LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); - switch (oxs->cfg.proto) { - case OSMO_SS7_ASP_PROT_IPA: - OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_TCP); - read_cb = &ss7_asp_ipa_srv_conn_cb; - break; - case OSMO_SS7_ASP_PROT_M3UA: - if (oxs->cfg.trans_proto == IPPROTO_SCTP) - read_cb = &ss7_asp_xua_srv_conn_cb; - else if (oxs->cfg.trans_proto == IPPROTO_TCP) - read_cb = &ss7_asp_m3ua_tcp_srv_conn_cb; - else - OSMO_ASSERT(0); - break; - default: - OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); - read_cb = &ss7_asp_xua_srv_conn_cb; - break; - } - - srv = osmo_stream_srv_create(oxs, link, fd, read_cb, - &ss7_asp_xua_srv_conn_closed_cb, NULL); + srv = osmo_stream_srv_create2(oxs, link, fd, NULL); if (!srv) { LOGP(DLSS7, LOGL_ERROR, "%s: Unable to create stream server " "for connection\n", sock_name); @@ -101,6 +80,28 @@ return -1; } + switch (oxs->cfg.proto) { + case OSMO_SS7_ASP_PROT_IPA: + osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, osmo_ipa_segmentation_cb); + break; + case OSMO_SS7_ASP_PROT_M3UA: + if (oxs->cfg.trans_proto == IPPROTO_SCTP) + osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); + else if (oxs->cfg.trans_proto == IPPROTO_TCP) { + osmo_stream_srv_set_read_cb(srv, &ss7_asp_m3ua_tcp_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, xua_tcp_segmentation_cb); + } else + OSMO_ASSERT(0); + break; + default: + OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); + osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, NULL); + break; + } + osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); + asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); if (asp) { LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 758da90..67c0ee3 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -24,9 +24,9 @@ bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto); -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn); -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn); -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn); +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); @@ -38,6 +38,8 @@ bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); +int xua_tcp_segmentation_cb(struct msgb *msg); + enum ss7_as_ctr { SS7_AS_CTR_RX_MSU_TOTAL, SS7_AS_CTR_TX_MSU_TOTAL, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 Gerrit-Change-Number: 35070 Gerrit-PatchSet: 9 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode

by laforge

Attention is currently required from: daniel, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 Gerrit-Change-Number: 35070 Gerrit-PatchSet: 9 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Mar 2024 18:05:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode

by fixeria

Attention is currently required from: daniel, jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 Gerrit-Change-Number: 35070 Gerrit-PatchSet: 9 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Mar 2024 17:40:27 +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 uploaded this change for review. ( 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, 100 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/80/36180/1 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..55eea36 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -175,7 +175,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) -> 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024