- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-epdg[master]: rebar.config: Update required OTP version 25.2.3
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36263?usp=email ) Change subject: rebar.config: Update required OTP version 25.2.3 ...................................................................... rebar.config: Update required OTP version 25.2.3 Since anyway we need debian12 for other reasons, like newer kernel, then also require OTP from debian12 which is the one being tested and we want to support. At the moment, debian12 OTP package version is 25.2.3. I am personally building with Archlinux's package version 26.2.2. Change-Id: I0ac7c93adbe88e1b738f1319cf1280c119ed59d1 --- M rebar.config 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/rebar.config b/rebar.config index 2403243..e72b908 100644 --- a/rebar.config +++ b/rebar.config @@ -10,7 +10,7 @@ {osmo_gsup, {git, "https://gerrit.osmocom.org/erlang/osmo_gsup", {branch, "osmocom/epdg"}}} ]}. -{minimum_otp_vsn, "20.3"}. +{minimum_otp_vsn, "25.2.3"}. {plugins, [ {rebar3_diameter_compiler, {git, "https://github.com/carlosedp/rebar3_diameter_compiler.git", {tag, "0.8.0"}}} -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36263?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: I0ac7c93adbe88e1b738f1319cf1280c119ed59d1 Gerrit-Change-Number: 36263 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: aaa_diameter_s6b.erl: Get rid of unused code
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?usp=email ) Change subject: aaa_diameter_s6b.erl: Get rid of unused code ...................................................................... aaa_diameter_s6b.erl: Get rid of unused code Change-Id: I9e94fe26073ddb1740c3ae1d761d359c3f1b7439 --- M src/aaa_diameter_s6b.erl 1 file changed, 13 insertions(+), 32 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index 163ffbd..baf251f 100644 --- a/src/aaa_diameter_s6b.erl +++ b/src/aaa_diameter_s6b.erl @@ -47,12 +47,9 @@ -export([start_link/0]). -export([start/0, stop/0, terminate/2]). %% gen_server Function Exports --export([init/1, handle_call/3, handle_cast/2, handle_info/2]). +-export([init/1, handle_call/3, handle_cast/2, handle_info/2, peer_down/3]). -export([code_change/3]). --export([multimedia_auth_request/6]). --export([server_assignment_request/3]). -export([tx_aa_answer/2, tx_st_answer/2]). --export([test/0, test/1]). %% Diameter Application Definitions -define(SERVER, ?MODULE). @@ -96,11 +93,6 @@ {module, ?CALLBACK_MOD}, {answer_errors, callback}]}]). --record(state, { - handlers, - peers = #{} -}). - %% @doc starts gen_server implementation process -spec start() -> ok | {error, term()}. start() -> @@ -115,9 +107,7 @@ start_link() -> gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). -peer_down(API, SvcName, {PeerRef, _} = Peer) -> - % fixme: why do we still have ets here? - (catch ets:delete(?MODULE, {API, PeerRef})), +peer_down(_API, SvcName, {_PeerRef, _} = Peer) -> gen_server:cast(?SERVER, {peer_down, SvcName, Peer}), ok. @@ -133,20 +123,6 @@ {ok, _} = listen({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), {ok, State}. -test() -> - test("001011234567890"). - -test(IMSI) -> - multimedia_auth_request(IMSI, 3, "EAP-AKA", 1, [], []). - -multimedia_auth_request(IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey) -> - gen_server:call(?SERVER, - {mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}). -% APN is optional and should be [] -server_assignment_request(IMSI, Type, APN) -> - gen_server:call(?SERVER, - {sar, {IMSI, Type, APN}}). - tx_aa_answer(Pid, DiaRC) -> % handle_request(AAR) was spawned into its own process, and it's blocked waiting for AAA: Pid ! {aaa, DiaRC}. @@ -155,12 +131,8 @@ % handle_request(STR) was spawned into its own process, and it's blocked waiting for STA: Pid ! {sta, DiaRC}. -result_code_success(2001) -> ok; -result_code_success(2002) -> ok; -result_code_success(_) -> invalid_result_code. - -handle_call({aar, {IMSI, Type, APN}}, _From, State) -> - SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)). +handle_call(Info, _From, State) -> + error_logger:error_report(["unknown handle_call", {module, ?MODULE}, {info, Info}, {state, State}]). %% @callback gen_server handle_cast(stop, State) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?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: I9e94fe26073ddb1740c3ae1d761d359c3f1b7439 Gerrit-Change-Number: 36234 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo-epdg[master]: AAA: Swx: Answer RTR with RTA
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?usp=email ) Change subject: AAA: Swx: Answer RTR with RTA ...................................................................... AAA: Swx: Answer RTR with RTA Related: OS#6042 Change-Id: Iba49fe8565d2303f975003ed2a79de25a4b23832 --- M include/conv.hrl M src/aaa_diameter_swx_cb.erl 2 files changed, 52 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/conv.hrl b/include/conv.hrl index 786bdff..dda21f4 100644 --- a/include/conv.hrl +++ b/include/conv.hrl @@ -31,6 +31,8 @@ % -hrl_name('conv.hrl'). +-define(VENDOR_ID_3GPP, 10415). + %% Can Hold information about Result-Code or Experimental-Result: -record(epdg_dia_rc, { vendor_id :: non_neg_integer(), %% or undefined if Result-Code diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 8a6dd08..4936c24 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -10,7 +10,8 @@ %% diameter callbacks -export([peer_up/3, peer_down/3, pick_peer/4, pick_peer/5, prepare_request/3, prepare_request/4, prepare_retransmit/3, prepare_retransmit/4, - handle_answer/4, handle_answer/5, handle_error/4, handle_error/5, handle_request/3]). + handle_request/3, + handle_answer/4, handle_answer/5, handle_error/4, handle_error/5]). %% peer_up/3 peer_up(_SvcName, Peer, State) -> @@ -67,6 +68,41 @@ prepare_retransmit(Packet, SvcName, Peer, ExtraPars) -> prepare_request(Packet, SvcName, Peer, ExtraPars). +%% handle_request/3 + +%% 3GPP TS 29.273 8.2.2.4 Network Initiated De-Registration by HSS Procedure +handle_request(#diameter_packet{msg = Req, errors = []}, _SvcName, {_, Caps}) when is_record(Req, 'RTR') -> + lager:info("SWx Rx RTR from ~p: ~p~n", [Caps, Req]), + #diameter_caps{origin_host = {OH,_}, origin_realm = {OR,_}} = Caps, + #'RTR'{'Session-Id' = SessionId, + 'Vendor-Specific-Application-Id' = VendorAppId, + 'Auth-Session-State' = AuthSessState, + 'User-Name' = Imsi, + 'Deregistration-Reason' = _DeregReason} = Req, + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + aaa_ue_fsm:stop(Pid), + Res = 2001, %% Success + ERes = []; + undefined -> + Res = [], + %% TS 29.229 6.2.2.1 DIAMETER_ERROR_USER_UNKNOWN + ERes = #'Experimental-Result'{'Vendor-Id' = ?VENDOR_ID_3GPP, 'Experimental-Result-Code' = 5001} + end, + Resp = #'RTA'{'Session-Id' = SessionId, + 'Vendor-Specific-Application-Id' = VendorAppId, + 'Result-Code' = Res, + 'Experimental-Result' = ERes, + 'Auth-Session-State' = AuthSessState, + 'Origin-Host' = OH, + 'Origin-Realm' = OR}, + lager:info("SWx Tx to ~p: ~p~n", [Caps, Resp]), + {reply, Resp}; + +handle_request(Msg, _SvcName, Peer) -> + lager:error("SWx Rx unexpected msg from ~p: ~p~n", [Peer, Msg]), + erlang:error({unexpected, ?MODULE, ?LINE}). + %% 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]), @@ -82,6 +118,7 @@ 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: @@ -103,9 +140,11 @@ aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {error, SAType, DiaRC}) end, {ok, Msg}. + handle_answer(#diameter_packet{msg = Msg, errors = []}, _Request, _SvcName, Peer) -> lager:info("SWx Rx ~p: ~p~n", [Peer, Msg]), {ok, Msg}; + handle_answer(#diameter_packet{msg = Msg, errors = Errors}, _Request, _SvcName, Peer) -> lager:info("SWx Rx ~p: ~p / Errors ~p ~n", [Peer, Msg, Errors]), {error, Errors}. @@ -122,10 +161,6 @@ lager:error("SWx error: ~p, ExtraPars: ~p~n", [Reason, ExtraPars]), {error, Reason}. -%% handle_request/3 -handle_request(_Packet, _SvcName, _Peer) -> - erlang:error({unexpected, ?MODULE, ?LINE}). - %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?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: Iba49fe8565d2303f975003ed2a79de25a4b23832 Gerrit-Change-Number: 36232 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Fix order of params in stop_and_reply
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?usp=email ) Change subject: epdg_ue_fsm: Fix order of params in stop_and_reply ...................................................................... epdg_ue_fsm: Fix order of params in stop_and_reply Change-Id: Icd058466463d215f4028d302cd45041e5627b459 --- M src/epdg_ue_fsm.erl 1 file changed, 12 insertions(+), 3 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 dbee78a..a422bea 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -179,7 +179,7 @@ ev_handle({call, From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn, EAP) of ok -> {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}; - {error, Err} -> {stop_and_reply, Err, Data, [{reply,From,{error,Err}}]} + {error, Err} -> {stop_and_reply, Err, [{reply,From,{error,Err}}], Data} end. %% ------------------------------------------------------------------ @@ -211,7 +211,7 @@ state_new({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), - {stop_and_reply, purge_ms_request, Data, [{reply,From,ok}]}. + {stop_and_reply, purge_ms_request, [{reply,From,ok}], Data}. state_wait_auth_resp(enter, _OldState, Data) -> {keep_state, Data}; @@ -242,7 +242,7 @@ % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": case epdg_diameter_swm:auth_compl_request(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn) of ok -> {keep_state, Data, [{reply,From,ok}]}; - {error, Err} -> {stop_and_reply, Err, Data, [{reply,From,{error,Err}}]} + {error, Err} -> {stop_and_reply, Err, [{reply,From,{error,Err}}], Data} end; % Rx Swm Diameter-EAP Answer (DEA) containing APN-Configuration, triggered by -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?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: Icd058466463d215f4028d302cd45041e5627b459 Gerrit-Change-Number: 36260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: jenkins.sh: use available Makefile, clean before building
by pespin 14 Mar '24

14 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36264?usp=email ) Change subject: jenkins.sh: use available Makefile, clean before building ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36264?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: Id3f2d71c184cf387fa178d5138d401686a8d0a63 Gerrit-Change-Number: 36264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 23:08:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Fix format error in log line
by pespin 14 Mar '24

14 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?usp=email ) Change subject: gsup_server: Fix format error in log line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?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: I4c724a65e49fc8bcaad7598fc07f3ddcbc9fa35f Gerrit-Change-Number: 36261 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, 13 Mar 2024 23:08:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Fix order of params in stop_and_reply
by pespin 14 Mar '24

14 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?usp=email ) Change subject: epdg_ue_fsm: Fix order of params in stop_and_reply ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?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: Icd058466463d215f4028d302cd45041e5627b459 Gerrit-Change-Number: 36260 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, 13 Mar 2024 23:07:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: aaa_diameter_s6b.erl: Get rid of unused code
by pespin 14 Mar '24

14 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?usp=email ) Change subject: aaa_diameter_s6b.erl: Get rid of unused code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?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: I9e94fe26073ddb1740c3ae1d761d359c3f1b7439 Gerrit-Change-Number: 36234 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, 13 Mar 2024 23:07:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo-epdg[master]: AAA: Swx: Answer RTR with RTA
by pespin 14 Mar '24

14 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?usp=email ) Change subject: AAA: Swx: Answer RTR with RTA ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?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: Iba49fe8565d2303f975003ed2a79de25a4b23832 Gerrit-Change-Number: 36232 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, 13 Mar 2024 23:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr
by neels 13 Mar '24

13 Mar '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... sockaddr_str: add conversion to,from osmo_sockaddr Add functions to pass struct osmo_sockaddr to the osmo_sockaddr_str_{to,from}* API directly. So far the interface to osmo_sockaddr_str_ is: osmo_sockaddr_str_from_sockaddr(&my_sa_str, &my_osa->u.sas); I'm working a lot with osmo_sockaddr at the moment, and the cumulated time of forgetting to add 'u.sas' and having another compilation cycle because of those is justifying this additional API. Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 --- M include/osmocom/core/sockaddr_str.h M src/core/libosmocore.map M src/core/sockaddr_str.c 3 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/36265/1 diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index c646f49..8ec514c 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -34,6 +34,7 @@ struct sockaddr_storage; struct sockaddr_in; struct sockaddr_in6; +struct osmo_sockaddr; /*! \defgroup sockaddr_str IP address/port utilities. * @{ @@ -84,6 +85,7 @@ int osmo_sockaddr_str_from_sockaddr_in(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_in *src); int osmo_sockaddr_str_from_sockaddr_in6(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_in6 *src); int osmo_sockaddr_str_from_sockaddr(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_storage *src); +int osmo_sockaddr_str_from_osa(struct osmo_sockaddr_str *sockaddr_str, const struct osmo_sockaddr *src); int osmo_sockaddr_str_to_in_addr(const struct osmo_sockaddr_str *sockaddr_str, struct in_addr *dst); int osmo_sockaddr_str_to_in6_addr(const struct osmo_sockaddr_str *sockaddr_str, struct in6_addr *dst); @@ -92,6 +94,7 @@ int osmo_sockaddr_str_to_sockaddr_in(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in *dst); int osmo_sockaddr_str_to_sockaddr_in6(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in6 *dst); int osmo_sockaddr_str_to_sockaddr(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_storage *dst); +int osmo_sockaddr_str_to_osa(const struct osmo_sockaddr_str *sockaddr_str, struct osmo_sockaddr *dst); int osmo_sockaddr_str_from_32n(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port) OSMO_DEPRECATED("osmo_sockaddr_str_from_32n() actually uses *host* byte order. Use osmo_sockaddr_str_from_32h() instead"); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 072efee..1cae47e 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -398,6 +398,7 @@ osmo_sockaddr_str_from_sockaddr; osmo_sockaddr_str_from_sockaddr_in; osmo_sockaddr_str_from_sockaddr_in6; +osmo_sockaddr_str_from_osa; osmo_sockaddr_str_from_str; osmo_sockaddr_str_from_str2; osmo_sockaddr_str_is_nonzero; @@ -410,6 +411,7 @@ osmo_sockaddr_str_to_sockaddr; osmo_sockaddr_str_to_sockaddr_in; osmo_sockaddr_str_to_sockaddr_in6; +osmo_sockaddr_str_to_osa; osmo_sockaddr_to_octets; osmo_sockaddr_to_str; osmo_sockaddr_to_str_and_uint; diff --git a/src/core/sockaddr_str.c b/src/core/sockaddr_str.c index 9f1e897..bea6184 100644 --- a/src/core/sockaddr_str.c +++ b/src/core/sockaddr_str.c @@ -33,6 +33,7 @@ #include <osmocom/core/sockaddr_str.h> #include <osmocom/core/utils.h> #include <osmocom/core/byteswap.h> +#include <osmocom/core/socket.h> /*! \addtogroup sockaddr_str * @@ -359,6 +360,17 @@ return -EINVAL; } +/*! Convert IPv4 or IPv6 address and port to osmo_sockaddr_str. + * \param[out] sockaddr_str The instance to copy to. + * \param[in] src IPv4 or IPv6 address and port data. + * \return 0 on success, negative if src does not indicate AF_INET nor AF_INET6 (or if the conversion fails, which + * should not be possible in practice). + */ +int osmo_sockaddr_str_from_osa(struct osmo_sockaddr_str *sockaddr_str, const struct osmo_sockaddr *src) +{ + return osmo_sockaddr_str_from_sockaddr(sockaddr_str, &src->u.sas); +} + /*! Convert osmo_sockaddr_str address string to IPv4 address data. * \param[in] sockaddr_str The instance to convert the IP of. * \param[out] dst IPv4 address data to write to. @@ -509,5 +521,15 @@ } } +/*! Convert osmo_sockaddr_str address string and port to IPv4 or IPv6 address and port data. + * \param[in] sockaddr_str The instance to convert the IP and port of. + * \param[out] dst IPv4/IPv6 address and port data to write to. + * \return 0 on success, negative on error (e.g. invalid IP address string for the family indicated by sockaddr_str->af). + */ +int osmo_sockaddr_str_to_osa(const struct osmo_sockaddr_str *sockaddr_str, struct osmo_sockaddr *dst) +{ + return osmo_sockaddr_str_to_sockaddr(sockaddr_str, &dst->u.sas); +} + /*! @} */ #endif // HAVE_NETINET_IN_H -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?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: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log