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

[S] Change in osmo-hnbgw[master]: rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36207?usp=email ) Change subject: rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only ...................................................................... rename hnbgw_peek_l3 to hnbgw_peek_l3_ul as it's uplink only Let's not make the functions appear more generic than they are: They all explicitly only support uplink so far. Change-Id: I7db0d933a8f17f8c410141f43dab12b8c19fc8ae --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_l3.c M src/osmo-hnbgw/hnbgw_rua.c 3 files changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/07/36207/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 98cdc34..58b0903 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -430,4 +430,4 @@ struct msgb *hnbgw_ranap_msg_alloc(const char *name); -int hnbgw_peek_l3(struct hnbgw_context_map *map, struct msgb *ranap_msg); +int hnbgw_peek_l3_ul(struct hnbgw_context_map *map, struct msgb *ranap_msg); diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index a6b48ce..1fd3398 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -156,8 +156,8 @@ return 0; } -static int peek_l3_nas(struct hnbgw_context_map *map, const uint8_t *nas_pdu, size_t len, - const struct osmo_plmn_id *local_plmn) +static int peek_l3_ul_nas(struct hnbgw_context_map *map, const uint8_t *nas_pdu, size_t len, + const struct osmo_plmn_id *local_plmn) { const struct gsm48_hdr *gh; int8_t pdisc; @@ -277,7 +277,7 @@ return 0; } -static int peek_l3_initial_ue(struct hnbgw_context_map *map, const RANAP_InitialUE_MessageIEs_t *ies) +static int peek_l3_ul_initial_ue(struct hnbgw_context_map *map, const RANAP_InitialUE_MessageIEs_t *ies) { struct osmo_plmn_id local_plmn; @@ -293,12 +293,12 @@ osmo_plmn_from_bcd(ies->lai.pLMNidentity.buf, &local_plmn); } - return peek_l3_nas(map, ies->nas_pdu.buf, ies->nas_pdu.size, &local_plmn); + return peek_l3_ul_nas(map, ies->nas_pdu.buf, ies->nas_pdu.size, &local_plmn); } -/* Extract a Layer 3 message (NAS PDU) from the RANAP message, and put the info obtained in map->l3. This is relevant - * for CN pooling, to decide which CN link to map the RUA context to. */ -int hnbgw_peek_l3(struct hnbgw_context_map *map, struct msgb *ranap_msg) +/* Extract a Layer 3 message (NAS PDU) from the uplink RANAP message, and put the info obtained in map->l3. + * This is relevant for CN pooling, to decide which CN link to map the RUA context to. */ +int hnbgw_peek_l3_ul(struct hnbgw_context_map *map, struct msgb *ranap_msg) { ranap_message *message = hnbgw_decode_ranap_co(ranap_msg); if (!message) { @@ -308,7 +308,7 @@ switch (message->procedureCode) { case RANAP_ProcedureCode_id_InitialUE_Message: - return peek_l3_initial_ue(map, &message->msg.initialUE_MessageIEs); + return peek_l3_ul_initial_ue(map, &message->msg.initialUE_MessageIEs); default: LOGP(DCN, LOGL_ERROR, "unexpected RANAP PDU in RUA Connect message: %s\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index ae518c0..5576fa4 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -194,7 +194,7 @@ map = context_map_alloc(hnb, rua_ctx_id, is_ps); OSMO_ASSERT(map); - if (hnbgw_peek_l3(map, ranap_msg)) + if (hnbgw_peek_l3_ul(map, ranap_msg)) LOGP(DCN, LOGL_NOTICE, "Failed to extract Mobile Identity from RUA Connect message's RANAP payload\n"); /* map->l3 now contains all the interesting information from the NAS PDU, if any. * If no useful information could be decoded, still continue to select a hopefully adequate link by round robin. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7db0d933a8f17f8c410141f43dab12b8c19fc8ae Gerrit-Change-Number: 36207 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email ) Change subject: cosmetic: Rename hnbgw_rx_ranap and friends to *_rx_ranap_udt_ul ...................................................................... Patch Set 2: (1 comment) File src/osmo-hnbgw/hnbgw_vty.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206/comment/d2f520c5_b8b3a90b PS2, Line 211: vty_out(vty, " MCC %03u MNC %u LAC %u RAC %u SAC %u CID %u SCTP-stream:HNBAP=%u,RUA=%u%s", THis looks non-related to this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36206?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I29e8176ac19b2e7390e5950b8d0944c8961e491f Gerrit-Change-Number: 36206 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 08 Mar 2024 12:28:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: Introduce umts_cell_id_from_str() as inverse of umts_cell_id_name()

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36204?usp=email ) Change subject: Introduce umts_cell_id_from_str() as inverse of umts_cell_id_name() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36204?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6da947d1f2316241e44e53bb6aaec4221cfaa2c0 Gerrit-Change-Number: 36204 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 08 Mar 2024 12:21:49 +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]: gsup_server: Spawn one process per rx message

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36199?usp=email ) Change subject: gsup_server: Spawn one process per rx message ...................................................................... gsup_server: Spawn one process per rx message This way if rx path crashes it won't affect the gsup_server socket, which will just discard the received packet. Change-Id: Ifb5ece08007be59657d0d2f428e9d991af696026 --- M src/gsup_server.erl 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/gsup_server.erl b/src/gsup_server.erl index ef87b67..0ef7ae7 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -227,7 +227,10 @@ %% Rx IPA/GSUP message: handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx}, State) -> lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), - rx_gsup(Socket, GsupMsgRx, State); + misc:spawn_wait_ret(fun() -> + rx_gsup(Socket, GsupMsgRx, State) + end, + {noreply, State}); handle_info(Info, S) -> error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36199?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: Ifb5ece08007be59657d0d2f428e9d991af696026 Gerrit-Change-Number: 36199 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 year, 5 months

1
0
0 0

[L] Change in ...osmo-epdg[master]: gsup_server: Move rx_gsup path to its own function

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36197?usp=email ) Change subject: gsup_server: Move rx_gsup path to its own function ...................................................................... gsup_server: Move rx_gsup path to its own function This is a preparation step to later on spawn one process per rx msg. Change-Id: Ie551ed14f7ab8c447f25981a6a1d6ed4ddb470b7 --- M src/gsup_server.erl 1 file changed, 132 insertions(+), 118 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/gsup_server.erl b/src/gsup_server.erl index 10495e1..4299e95 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -228,125 +228,10 @@ ipa_proto:unblock(Socket), {noreply, S#gsups_state{socket=Socket}}; -% send auth info / requesting authentication tuples -handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) -> +%% Rx IPA/GSUP message: +handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx}, State) -> lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), - case maps:find(pdp_info_list, GsupMsgRx) of - {ok, [PdpInfo]} -> - #{pdp_context_id := _PDPCtxId, - pdp_address := #{address := #{}, - pdp_type_nr := PdpTypeNr, - pdp_type_org := 241}, - access_point_name := Apn - } = PdpInfo; - error -> % Use some sane defaults: - PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, - Apn = "*" - end, - {UE, State1} = find_or_new_gsups_ue(Imsi, State0), - case epdg_ue_fsm:auth_request(UE#gsups_ue.pid, {PdpTypeNr, Apn}) of - ok -> State2 = State1; - {error, Err} -> - lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), - Resp = #{message_type => send_auth_info_err, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_NET_FAIL - }, - tx_gsup(Socket, Resp), - State2 = delete_gsups_ue(UE, State1), - epdg_ue_fsm:stop(UE#gsups_ue.pid) - end, - {noreply, State2}; - -% location update request / when a UE wants to connect to a specific APN. This will trigger a AAA->HLR Request Server Assignment Request -% FIXME: add APN instead of hardcoded internet -handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := location_upd_req, imsi := Imsi}}, State) -> - lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), - UE = find_gsups_ue_by_imsi(Imsi, State), - case UE of - #gsups_ue{imsi = Imsi} -> - case epdg_ue_fsm:lu_request(UE#gsups_ue.pid) of - ok -> ok; - {error, _} -> - Resp = #{message_type => location_upd_err, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_NET_FAIL - }, - tx_gsup(Socket, Resp) - end; - undefined -> - Resp = #{message_type => location_upd_err, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_IMSI_UNKNOWN - }, - tx_gsup(Socket, Resp) - end, - {noreply, State}; - -% epdg tunnel request / trigger the establishment to the PGW and prepares everything for the user traffic to flow -% When sending a epdg_tunnel_response everything must be ready for the UE traffic -handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := epdg_tunnel_request, imsi := Imsi, pco := PCO}}, State) -> - lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), - UE = find_gsups_ue_by_imsi(Imsi, State), - case UE of - #gsups_ue{imsi = Imsi} -> - case epdg_ue_fsm:tunnel_request(UE#gsups_ue.pid, PCO) of - ok -> ok; - {error, _} -> - Resp = #{message_type => epdg_tunnel_error, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_NET_FAIL - }, - tx_gsup(Socket, Resp) - end; - undefined -> - Resp = #{message_type => epdg_tunnel_error, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_IMSI_UNKNOWN - }, - tx_gsup(Socket, Resp) - end, - {noreply, State}; - -% Purge MS / trigger the delete of session to the PGW -handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := purge_ms_req, imsi := Imsi}}, State) -> - lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), - UE = find_gsups_ue_by_imsi(Imsi, State), - case UE of - #gsups_ue{imsi = Imsi} -> - case epdg_ue_fsm:purge_ms_request(UE#gsups_ue.pid) of - ok -> ok; - _ -> Resp = #{message_type => purge_ms_err, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_NET_FAIL - }, - tx_gsup(Socket, Resp) - end; - undefined -> - Resp = #{message_type => purge_ms_err, - imsi => Imsi, - message_class => 5, - cause => ?GSUP_CAUSE_IMSI_UNKNOWN - }, - tx_gsup(Socket, Resp) - end, - {noreply, State}; - -% Our GSUP CEAI implementation for "IKEv2 Information Delete Response". -handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := location_cancellation_res, imsi := Imsi}}, State0) -> - lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), - UE = find_gsups_ue_by_imsi(Imsi, State0), - case UE of - #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(UE, State0); - undefined -> State1 = State0 - end, - {noreply, State1}; + rx_gsup(Socket, GsupMsgRx, State); handle_info({'DOWN', MRef, process, Pid, Reason}, State0) -> lager:notice("GSUP: epdg_ue_fsm ~p exited, reason: ~p~n", [Pid, Reason]), @@ -388,6 +273,124 @@ %% Internal Function Definitions %% ------------------------------------------------------------------ +% Rx send auth info / requesting authentication tuples +rx_gsup(Socket, GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}, State0) -> + case maps:find(pdp_info_list, GsupMsgRx) of + {ok, [PdpInfo]} -> + #{pdp_context_id := _PDPCtxId, + pdp_address := #{address := #{}, + pdp_type_nr := PdpTypeNr, + pdp_type_org := 241}, + access_point_name := Apn + } = PdpInfo; + error -> % Use some sane defaults: + PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, + Apn = "*" + end, + {UE, State1} = find_or_new_gsups_ue(Imsi, State0), + case epdg_ue_fsm:auth_request(UE#gsups_ue.pid, {PdpTypeNr, Apn}) of + ok -> State2 = State1; + {error, Err} -> + lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), + Resp = #{message_type => send_auth_info_err, + imsi => Imsi, + message_class => 5, + cause => ?GSUP_CAUSE_NET_FAIL + }, + tx_gsup(Socket, Resp), + State2 = delete_gsups_ue(UE, State1), + epdg_ue_fsm:stop(UE#gsups_ue.pid) + end, + {noreply, State2}; + +% location update request / when a UE wants to connect to a specific APN. This will trigger a AAA->HLR Request Server Assignment Request +rx_gsup(Socket, _GsupMsgRx = #{message_type := location_upd_req, imsi := Imsi}, State) -> + UE = find_gsups_ue_by_imsi(Imsi, State), + case UE of + #gsups_ue{imsi = Imsi} -> + case epdg_ue_fsm:lu_request(UE#gsups_ue.pid) of + ok -> ok; + {error, _} -> + Resp = #{message_type => location_upd_err, + imsi => Imsi, + message_class => 5, + cause => ?GSUP_CAUSE_NET_FAIL + }, + tx_gsup(Socket, Resp) + end; + undefined -> + Resp = #{message_type => location_upd_err, + imsi => Imsi, + message_class => 5, + cause => ?GSUP_CAUSE_IMSI_UNKNOWN + }, + tx_gsup(Socket, Resp) + end, + {noreply, State}; + +% epdg tunnel request / trigger the establishment to the PGW and prepares everything for the user traffic to flow +% When sending a epdg_tunnel_response everything must be ready for the UE traffic +rx_gsup(Socket, _GsupMsgRx = #{message_type := epdg_tunnel_request, imsi := Imsi, pco := PCO}, State) -> + UE = find_gsups_ue_by_imsi(Imsi, State), + case UE of + #gsups_ue{imsi = Imsi} -> + case epdg_ue_fsm:tunnel_request(UE#gsups_ue.pid, PCO) of + ok -> ok; + {error, _} -> + Resp = #{message_type => epdg_tunnel_error, + imsi => Imsi, + message_class => 5, + cause => ?GSUP_CAUSE_NET_FAIL + }, + tx_gsup(Socket, Resp) + end; + undefined -> + Resp = #{message_type => epdg_tunnel_error, + imsi => Imsi, + message_class => 5, + cause => ?GSUP_CAUSE_IMSI_UNKNOWN + }, + tx_gsup(Socket, Resp) + end, + {noreply, State}; + +% Purge MS / trigger the delete of session to the PGW +rx_gsup(Socket, _GsupMsgRx = #{message_type := purge_ms_req, imsi := Imsi}, State) -> + UE = find_gsups_ue_by_imsi(Imsi, State), + case UE of + #gsups_ue{imsi = Imsi} -> + case epdg_ue_fsm:purge_ms_request(UE#gsups_ue.pid) of + ok -> ok; + _ -> Resp = #{message_type => purge_ms_err, + imsi => Imsi, + message_class => 5, + cause => ?GSUP_CAUSE_NET_FAIL + }, + tx_gsup(Socket, Resp) + end; + undefined -> + Resp = #{message_type => purge_ms_err, + imsi => Imsi, + message_class => 5, + cause => ?GSUP_CAUSE_IMSI_UNKNOWN + }, + tx_gsup(Socket, Resp) + end, + {noreply, State}; + +% Our GSUP CEAI implementation for "IKEv2 Information Delete Response". +rx_gsup(_Socket, _GsupMsgRx = #{message_type := location_cancellation_res, imsi := Imsi}, State0) -> + UE = find_gsups_ue_by_imsi(Imsi, State0), + case UE of + #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(UE, State0); + undefined -> State1 = State0 + end, + {noreply, State1}; + +rx_gsup(_Socket, GsupMsgRx, State) -> + lager:error("GSUP: Rx unimplemented msg: ~p~n", [GsupMsgRx]), + {noreply, State}. + tx_gsup(Socket, Msg) -> lager:info("GSUP: Tx ~p~n", [Msg]), ipa_proto:send(Socket, ?IPAC_PROTO_EXT_GSUP, Msg). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36197?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: Ie551ed14f7ab8c447f25981a6a1d6ed4ddb470b7 Gerrit-Change-Number: 36197 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 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Move spawn_wait_ret() to a new misc.erl file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36196?usp=email ) Change subject: Move spawn_wait_ret() to a new misc.erl file ...................................................................... Move spawn_wait_ret() to a new misc.erl file It may be reused by other modules spawning process per message, like gsup_server.erl. Change-Id: I9777b73942e9dc672dd944a82045710b78893974 --- M src/epdg_gtpc_s2b.erl A src/misc.erl 2 files changed, 68 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index a8a42a2..dce038f 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -188,10 +188,10 @@ %% @callback gen_server handle_info({udp, _Socket, IP, InPortNo, RxMsg}, State) -> lager:debug("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, RxMsg]), - spawn_wait_ret(fun() -> - rx_udp(IP, InPortNo, RxMsg, State) - end, - {noreply, State}); + misc:spawn_wait_ret(fun() -> + rx_udp(IP, InPortNo, RxMsg, State) + end, + {noreply, State}); handle_info(Info, State) -> lager:info("S2b handle_info: ~p ~n", [Info]), {noreply, State}. @@ -378,22 +378,6 @@ connect(Address) -> connect(?SVC_NAME, Address). -%% Calls Fun on a spawned monitored process and returns Fun ret. -%% If spawned process crashes, return DefaultRet. -spawn_wait_ret(Fun, DefaultRet) -> - MyPID=self(), - {Pid, MRef} = spawn_monitor(fun() -> - Ret = Fun(), - MyPID ! {self(), Ret} - end), - receive - {'DOWN', MRef, process, _, _Reason} -> - DefaultRet; - {Pid, Ret} -> - erlang:demonitor(MRef, [flush]), - Ret - end. - rx_udp(IP, InPortNo, RxMsg, State) -> Req = gtp_packet:decode(RxMsg), lager:debug("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, Req]), diff --git a/src/misc.erl b/src/misc.erl new file mode 100644 index 0000000..fd85264 --- /dev/null +++ b/src/misc.erl @@ -0,0 +1,52 @@ +% Misc helpers +% (C) 2023 by sysmocom +% +% All Rights Reserved +% +% This program is free software; you can redistribute it and/or modify +% it under the terms of the GNU Affero General Public License as +% published by the Free Software Foundation; either version 3 of the +% License, or (at your option) any later version. +% +% This program is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU Affero General Public License +% along with this program. If not, see <http://www.gnu.org/licenses/>. +% +% Additional Permission under GNU AGPL version 3 section 7: +% +% If you modify this Program, or any covered work, by linking or +% combining it with runtime libraries of Erlang/OTP as released by +% Ericsson on http://www.erlang.org (or a modified version of these +% libraries), containing parts covered by the terms of the Erlang Public +% License (http://www.erlang.org/EPLICENSE), the licensors of this +% Program grant you additional permission to convey the resulting work +% without the need to license the runtime libraries of Erlang/OTP under +% the GNU Affero General Public License. Corresponding Source for a +% non-source form of such a combination shall include the source code +% for the parts of the runtime libraries of Erlang/OTP used as well as +% that of the covered work. +% +-module(misc). +-author('Pau Espin Pedrol <pespin(a)sysmocom.de>'). + +-export([spawn_wait_ret/2]). + +%% Calls Fun on a spawned monitored process and returns Fun ret. +%% If spawned process crashes, return DefaultRet. +spawn_wait_ret(Fun, DefaultRet) -> + MyPID=self(), + {Pid, MRef} = spawn_monitor(fun() -> + Ret = Fun(), + MyPID ! {self(), Ret} + end), + receive + {'DOWN', MRef, process, _, _Reason} -> + DefaultRet; + {Pid, Ret} -> + erlang:demonitor(MRef, [flush]), + Ret + end. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36196?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: I9777b73942e9dc672dd944a82045710b78893974 Gerrit-Change-Number: 36196 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: gsup_server: Look up epdg_ue_fsm process each time it needs to be acc...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36198?usp=email ) Change subject: gsup_server: Look up epdg_ue_fsm process each time it needs to be accessed ...................................................................... gsup_server: Look up epdg_ue_fsm process each time it needs to be accessed This allows simplifying a lot gsup_server state, make it far less prone to bugs due to state ending up in an unconsistent state. Nowadays the state is held in the epdg_ue_fsm. It also allows easily spawning a process per rx msg, since no start_monitor() is required (monitor would need to be passed to parent gen_server process then from the per message spawned process). Change-Id: I80203a7cf0efe82eec3773ee773d25310c07a2c3 --- M src/epdg_ue_fsm.erl M src/gsup_server.erl 2 files changed, 51 insertions(+), 105 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index fd0d7f9..fc3a7e9 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -39,7 +39,7 @@ -include_lib("gtp_utils.hrl"). -include("conv.hrl"). --export([start_monitor/1, stop/1]). +-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([auth_request/2, lu_request/1, tunnel_request/2, purge_ms_request/1]). @@ -68,10 +68,10 @@ ServerName = get_server_name_by_imsi(Imsi), whereis(ServerName). -start_monitor(Imsi) -> +start(Imsi) -> ServerName = get_server_name_by_imsi(Imsi), - lager:info("ue_fsm start_monitor(~p)~n", [ServerName]), - gen_statem:start_monitor({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). + lager:info("ue_fsm start(~p)~n", [ServerName]), + gen_statem:start({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). stop(SrvRef) -> try diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 4299e95..ef87b67 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -49,14 +49,7 @@ lsocket, % listening socket lport, % local port. only interesting if we bind with port 0 socket, % current active socket. we only support a single tcp connection - ccm_options, % ipa ccm options - ues = sets:new() - }). - --record(gsups_ue, { - imsi :: binary(), - pid :: pid(), - mref :: reference() + ccm_options % ipa ccm options }). -export([start_link/3]). @@ -180,9 +173,9 @@ tx_gsup(Socket, Resp), {noreply, State}; -handle_cast({purge_ms_response, {Imsi, Result}}, State0) -> +handle_cast({purge_ms_response, {Imsi, Result}}, State) -> lager:info("purge_ms_response for ~p: ~p~n", [Imsi, Result]), - Socket = State0#gsups_state.socket, + Socket = State#gsups_state.socket, case Result of ok -> Resp = #{message_type => purge_ms_res, @@ -196,8 +189,11 @@ } end, tx_gsup(Socket, Resp), - State1 = delete_gsups_ue_by_imsi(Imsi, State0), - {noreply, State1}; + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> epdg_ue_fsm:stop(Pid); + undefined -> ok + end, + {noreply, State}; % Our GSUP CEAI implementation for "IKEv2 Information Delete Request" handle_cast({cancel_location_request, Imsi}, State) -> @@ -233,11 +229,6 @@ lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), rx_gsup(Socket, GsupMsgRx, State); -handle_info({'DOWN', MRef, process, Pid, Reason}, State0) -> - lager:notice("GSUP: epdg_ue_fsm ~p exited, reason: ~p~n", [Pid, Reason]), - State1 = delete_gsups_ue_by_mref(MRef, State0), - {noreply, State1}; - handle_info(Info, S) -> error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -274,7 +265,7 @@ %% ------------------------------------------------------------------ % Rx send auth info / requesting authentication tuples -rx_gsup(Socket, GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}, State0) -> +rx_gsup(Socket, GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}, State) -> case maps:find(pdp_info_list, GsupMsgRx) of {ok, [PdpInfo]} -> #{pdp_context_id := _PDPCtxId, @@ -287,9 +278,12 @@ PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, Apn = "*" end, - {UE, State1} = find_or_new_gsups_ue(Imsi, State0), - case epdg_ue_fsm:auth_request(UE#gsups_ue.pid, {PdpTypeNr, Apn}) of - ok -> State2 = State1; + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + undefined -> {ok, Pid} = epdg_ue_fsm:start(Imsi); + Pid -> Pid + end, + case epdg_ue_fsm:auth_request(Pid, {PdpTypeNr, Apn}) of + ok -> ok; {error, Err} -> lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), Resp = #{message_type => send_auth_info_err, @@ -298,17 +292,15 @@ cause => ?GSUP_CAUSE_NET_FAIL }, tx_gsup(Socket, Resp), - State2 = delete_gsups_ue(UE, State1), - epdg_ue_fsm:stop(UE#gsups_ue.pid) + epdg_ue_fsm:stop(Pid) end, - {noreply, State2}; + {noreply, State}; % location update request / when a UE wants to connect to a specific APN. This will trigger a AAA->HLR Request Server Assignment Request rx_gsup(Socket, _GsupMsgRx = #{message_type := location_upd_req, imsi := Imsi}, State) -> - UE = find_gsups_ue_by_imsi(Imsi, State), - case UE of - #gsups_ue{imsi = Imsi} -> - case epdg_ue_fsm:lu_request(UE#gsups_ue.pid) of + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + case epdg_ue_fsm:lu_request(Pid) of ok -> ok; {error, _} -> Resp = #{message_type => location_upd_err, @@ -331,10 +323,9 @@ % epdg tunnel request / trigger the establishment to the PGW and prepares everything for the user traffic to flow % When sending a epdg_tunnel_response everything must be ready for the UE traffic rx_gsup(Socket, _GsupMsgRx = #{message_type := epdg_tunnel_request, imsi := Imsi, pco := PCO}, State) -> - UE = find_gsups_ue_by_imsi(Imsi, State), - case UE of - #gsups_ue{imsi = Imsi} -> - case epdg_ue_fsm:tunnel_request(UE#gsups_ue.pid, PCO) of + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + case epdg_ue_fsm:tunnel_request(Pid, PCO) of ok -> ok; {error, _} -> Resp = #{message_type => epdg_tunnel_error, @@ -356,10 +347,9 @@ % Purge MS / trigger the delete of session to the PGW rx_gsup(Socket, _GsupMsgRx = #{message_type := purge_ms_req, imsi := Imsi}, State) -> - UE = find_gsups_ue_by_imsi(Imsi, State), - case UE of - #gsups_ue{imsi = Imsi} -> - case epdg_ue_fsm:purge_ms_request(UE#gsups_ue.pid) of + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + case epdg_ue_fsm:purge_ms_request(Pid) of ok -> ok; _ -> Resp = #{message_type => purge_ms_err, imsi => Imsi, @@ -379,13 +369,12 @@ {noreply, State}; % Our GSUP CEAI implementation for "IKEv2 Information Delete Response". -rx_gsup(_Socket, _GsupMsgRx = #{message_type := location_cancellation_res, imsi := Imsi}, State0) -> - UE = find_gsups_ue_by_imsi(Imsi, State0), - case UE of - #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(UE, State0); - undefined -> State1 = State0 +rx_gsup(_Socket, _GsupMsgRx = #{message_type := location_cancellation_res, imsi := Imsi}, State) -> + case epdg_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> epdg_ue_fsm:stop(Pid); + undefined -> State end, - {noreply, State1}; + {noreply, State}; rx_gsup(_Socket, GsupMsgRx, State) -> lager:error("GSUP: Rx unimplemented msg: ~p~n", [GsupMsgRx]), @@ -394,62 +383,3 @@ tx_gsup(Socket, Msg) -> lager:info("GSUP: Tx ~p~n", [Msg]), ipa_proto:send(Socket, ?IPAC_PROTO_EXT_GSUP, Msg). - - -new_gsups_ue(Imsi, State) -> - case epdg_ue_fsm:start_monitor(Imsi) of - {ok, {Pid, MRef}} -> ok; - {error,{already_started,PrevPid}} -> - lager:notice("epdg_ue_fsm for Imsi ~p already existed, reusing!: ~p~n", [Imsi, PrevPid]), - Pid = PrevPid, - MRef = erlang:monitor(process, Pid) - end, - UE = #gsups_ue{imsi = Imsi, pid = Pid, mref = MRef}, - NewSt = State#gsups_state{ues = sets:add_element(UE, State#gsups_state.ues)}, - {UE, NewSt}. - -% returns gsups_ue if found, undefined it not -find_gsups_ue_by_imsi(Imsi, State) -> - {Imsi, Res} = sets:fold( - fun(SessIt = #gsups_ue{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; - (_, AccIn) -> AccIn - end, - {Imsi, undefined}, - State#gsups_state.ues), - Res. - -find_gsups_ue_by_mref(MRef, State) -> - {MRef, Res} = sets:fold( - fun(SessIt = #gsups_ue{imsi = LookupMRef}, {LookupMRef, _AccIn}) -> {LookupMRef, SessIt}; - (_, AccIn) -> AccIn - end, - {MRef, undefined}, - State#gsups_state.ues), - Res. - -find_or_new_gsups_ue(Imsi, State) -> - UE = find_gsups_ue_by_imsi(Imsi, State), - case UE of - #gsups_ue{imsi = Imsi} -> - {UE, State}; - undefined -> - new_gsups_ue(Imsi, State) - end. - -delete_gsups_ue(UE, State) -> - erlang:demonitor(UE#gsups_ue.mref, [flush]), - SetRemoved = sets:del_element(UE, State#gsups_state.ues), - lager:debug("Removed UE ~p from ~p~n", [UE, SetRemoved]), - State#gsups_state{ues = SetRemoved}. - -delete_gsups_ue_by_imsi(Imsi, State) -> - case find_gsups_ue_by_imsi(Imsi, State) of - undefined -> State; - UE-> delete_gsups_ue(UE, State) - end. - -delete_gsups_ue_by_mref(MRef, State) -> - case find_gsups_ue_by_mref(MRef, State) of - undefined -> State; - UE-> delete_gsups_ue(UE, State) - end. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36198?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: I80203a7cf0efe82eec3773ee773d25310c07a2c3 Gerrit-Change-Number: 36198 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 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Spawn one process per rx message

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36199?usp=email ) Change subject: gsup_server: Spawn one process per rx message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36199?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: Ifb5ece08007be59657d0d2f428e9d991af696026 Gerrit-Change-Number: 36199 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: Fri, 08 Mar 2024 12:15:24 +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]: gsup_server: Look up epdg_ue_fsm process each time it needs to be acc...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36198?usp=email ) Change subject: gsup_server: Look up epdg_ue_fsm process each time it needs to be accessed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36198?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: I80203a7cf0efe82eec3773ee773d25310c07a2c3 Gerrit-Change-Number: 36198 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: Fri, 08 Mar 2024 12:15:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[L] Change in ...osmo-epdg[master]: gsup_server: Move rx_gsup path to its own function

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36197?usp=email ) Change subject: gsup_server: Move rx_gsup path to its own function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36197?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: Ie551ed14f7ab8c447f25981a6a1d6ed4ddb470b7 Gerrit-Change-Number: 36197 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: Fri, 08 Mar 2024 12:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024