October 2023 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-epdg[master]: Several fixes and improvement around env config use
by pespin 13 Oct '23

13 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34740?usp=email ) Change subject: Several fixes and improvement around env config use ...................................................................... Several fixes and improvement around env config use For some unknown reason, when app is run as an escript it fails to match/load the config files unless the AppName osmo-epdg is used. Change-Id: I729513ff1f904b78971d22e49622707c8bc0e4aa --- M config/sys.config M src/epdg_diameter_swx.erl 2 files changed, 35 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/40/34740/1 diff --git a/config/sys.config b/config/sys.config index 23f7936..f9fd5ed 100755 --- a/config/sys.config +++ b/config/sys.config @@ -1,16 +1,16 @@ [%% =========================================== %% Application config %% =========================================== - {epdg_diameter_swx, + {osmo_epdg, [% Connection parameters - {diameter_server_ip, "192.168.56.132"}, - {diameter_port, 3868}, + {diameter_remote_ip, "127.0.0.1"}, + {diameter_remote_port, 3868}, {diameter_proto, sctp}, % Server parameters {vendor_id, 0}, - {origin_host, "aaa.gprs.fe80.eu"}, - {origin_realm, "gprs.fe80.eu"}, - {context_id, "gprs(a)giameter.com"}]}, + {origin_host, "epdg.localdomain"}, + {origin_realm, "localdomain"}, + {context_id, "epdg@localdomain"}]}, %% =========================================== %% SASL config %% =========================================== diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index 9909446..fe89f11 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -59,6 +59,14 @@ -define(APP_ALIAS, ?MODULE). -define(CALLBACK_MOD, epdg_diameter_swx_cb). -define(DIAMETER_DICT_SWX, diameter_3gpp_ts29_273_swx). +-define(ENV_APP_NAME, osmo_epdg). +-define(ENV_DEFAULT_SESSION_ID, "epdg@localdomain"). +-define(ENV_DEFAULT_ORIG_REALM, "localdomain"). +-define(ENV_DEFAULT_ORIG_HOST, "epdg.localdomain"). +-define(ENV_DEFAULT_VENDOR_ID, 0). +-define(ENV_DEFAULT_DIAMETER_PROTO, sctp). +-define(ENV_DEFAULT_DIAMETER_REMOTE_IP, "127.0.0.1"). +-define(ENV_DEFAULT_DIAMETER_REMOTE_PORT, 3868). -define(VENDOR_ID_3GPP, 10415). -define(VENDOR_ID_3GPP2, 5535). @@ -68,9 +76,9 @@ %% supporting multiple Diameter applications may or may not want to %% configure a common callback module on all applications. -define(SERVICE, - [{'Origin-Host', application:get_env(?SERVER, origin_host, "aaa.example.org")}, - {'Origin-Realm', application:get_env(?SERVER, origin_realm, "realm.example.org")}, - {'Vendor-Id', application:get_env(?SERVER, vendor_id, 0)}, + [{'Origin-Host', application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)}, + {'Origin-Realm', application:get_env(?ENV_APP_NAME, origin_realm, ?ENV_DEFAULT_ORIG_REALM)}, + {'Vendor-Id', application:get_env(?ENV_APP_NAME, vendor_id, ?ENV_DEFAULT_VENDOR_ID)}, {'Vendor-Specific-Application-Id', [#'diameter_base_Vendor-Specific-Application-Id'{ 'Vendor-Id' = ?VENDOR_ID_3GPP, @@ -110,9 +118,9 @@ ok. init(State) -> - Proto = application:get_env(?SERVER, diameter_proto, sctp), - Ip = application:get_env(?SERVER, diameter_server_ip, "192.168.56.132"), - Port = application:get_env(?SERVER, diameter_port, 3868), + Proto = application:get_env(?ENV_APP_NAME, diameter_proto, ?ENV_DEFAULT_DIAMETER_PROTO), + Ip = application:get_env(?ENV_APP_NAME, diameter_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), + Port = application:get_env(?ENV_APP_NAME, diameter_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), {ok, _} = connect({address, Proto, Ip, Port}), @@ -159,7 +167,7 @@ % parse_mar(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) -> handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}, _From, State) -> - SessionId = diameter:session_id(application:get_env(?SERVER, origin_host, "aaa.example.org")), + SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)), MAR = #'MAR'{'Vendor-Specific-Application-Id' = #'Vendor-Specific-Application-Id'{ 'Vendor-Id' = ?VENDOR_ID_3GPP, 'Auth-Application-Id' = [?DIAMETER_APP_ID_SWX]}, @@ -182,7 +190,7 @@ {reply, {error, Err}, State} end; handle_call({sar, {IMSI, Type, APN}}, _From, State) -> - SessionId = diameter:session_id(application:get_env(?SERVER, origin_host, "aaa.example.org")), + SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)), SAR = #'SAR'{'Vendor-Specific-Application-Id' = #'Vendor-Specific-Application-Id'{ 'Vendor-Id' = ?VENDOR_ID_3GPP, 'Auth-Application-Id' = [?DIAMETER_APP_ID_SWX]}, @@ -236,6 +244,7 @@ %% connect/2 connect(Name, {address, Protocol, IPAddr, Port}) -> + lager:notice("~s connecting to IP ~s port ~p~n", [Name, IPAddr, Port]), {ok, IP} = inet_parse:address(IPAddr), TransportOpts = [{transport_module, tmod(Protocol)}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34740?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: I729513ff1f904b78971d22e49622707c8bc0e4aa Gerrit-Change-Number: 34740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: Add config envvars to change GSUP server listen IP addr and port
by pespin 13 Oct '23

13 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34741?usp=email ) Change subject: Add config envvars to change GSUP server listen IP addr and port ...................................................................... Add config envvars to change GSUP server listen IP addr and port Change-Id: I55244df82ee50b268ef0cbbe698e691707e8a716 --- M config/sys.config M src/osmo_epdg_sup.erl 2 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/41/34741/1 diff --git a/config/sys.config b/config/sys.config index f9fd5ed..8d751b9 100755 --- a/config/sys.config +++ b/config/sys.config @@ -2,11 +2,14 @@ %% Application config %% =========================================== {osmo_epdg, - [% Connection parameters + [% GSUP Server connection parameters + {gsup_local_ip, "0.0.0.0"}, + {gsup_local_port, 4222}, + % Diameter Connection parameters {diameter_remote_ip, "127.0.0.1"}, {diameter_remote_port, 3868}, {diameter_proto, sctp}, - % Server parameters + % Diameter Server parameters {vendor_id, 0}, {origin_host, "epdg.localdomain"}, {origin_realm, "localdomain"}, diff --git a/src/osmo_epdg_sup.erl b/src/osmo_epdg_sup.erl index a523a7f..457d993 100644 --- a/src/osmo_epdg_sup.erl +++ b/src/osmo_epdg_sup.erl @@ -5,16 +5,22 @@ -export([init/1]). -define(SERVER, ?MODULE). +-define(ENV_APP_NAME, osmo_epdg). +-define(ENV_DEFAULT_GSUP_LOCAL_IP, "0.0.0.0"). +-define(ENV_DEFAULT_GSUP_LOCAL_PORT, 4222). + start_link() -> supervisor:start_link({local, ?SERVER}, ?MODULE, []). init([]) -> + GsupLocalIp = application:get_env(?ENV_APP_NAME, gsup_local_ip, ?ENV_DEFAULT_GSUP_LOCAL_IP), + GsupLocalPort = application:get_env(?ENV_APP_NAME, gsup_local_port, ?ENV_DEFAULT_GSUP_LOCAL_PORT), DiaServer = {epdg_diameter_swx, {epdg_diameter_swx,start_link,[]}, permanent, 5000, worker, [epdg_diameter_swx_cb]}, - GsupServer = {gsup_server, {gsup_server, start_link, ["0.0.0.0", 4222, []]}, + GsupServer = {gsup_server, {gsup_server, start_link, [GsupLocalIp, GsupLocalPort, []]}, permanent, 5000, worker, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34741?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: I55244df82ee50b268ef0cbbe698e691707e8a716 Gerrit-Change-Number: 34741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libgtpnl[master]: IPv4-in-IPv6-GTP and IPv6-in-IPv4-GTP
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34739?usp=email ) Change subject: IPv4-in-IPv6-GTP and IPv6-in-IPv4-GTP ...................................................................... Patch Set 1: (1 comment) File src/gtp-genl.c: https://gerrit.osmocom.org/c/libgtpnl/+/34739/comment/4e39e7df_8990025b PS1, Line 136: struct { IIUC ms_addr is the upper layer IP address and sgsn_addr (inside gtp) is the lower layer IP address (below gtp)? I already thought about this in the first patch, but now I think it even makes more sense: Shouldn't we actually packing together sgsn-addr and ms_addr instead? struct { struct in_addr ip; struct in6_addr ip6; } sgsn_addr; struct { struct in_addr ip; struct in6_addr ip6; } ms_addr; TBH we could even use a sockaddr_storage and fill the sa_fanmily for each one: struct sockaddr_storage sgsn_addr; struct sockaddr_storage ms_addr; Because AFAIU they should be actually a union for ipv4 and ipv6, because they cannot be used both at the same time. Even reuse osmo_sockaddr idea: struct osmo_sockaddr { union { struct sockaddr sa; struct sockaddr_storage sas; struct sockaddr_in sin; struct sockaddr_in6 sin6; } u; }; -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ibc581a92a561dc0bd9924d9f15c7a27dc513c8d7 Gerrit-Change-Number: 34739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:42:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libgtpnl[master]: gtp-genl: allocate room for maximum IPv6 address
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34738?usp=email ) Change subject: gtp-genl: allocate room for maximum IPv6 address ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I2283e0c3112bec8e6e7e7b5c96657facc09d0a7a Gerrit-Change-Number: 34738 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:30:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libgtpnl[master]: update to prepare for IPv6 support
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email ) Change subject: update to prepare for IPv6 support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ifc7e3b03a723fb544d1c7b789101102b2c27b60e Gerrit-Change-Number: 34734 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:30:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libgtpnl[master]: tools: gtp-tunnel: add IPv6 support
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34737?usp=email ) Change subject: tools: gtp-tunnel: add IPv6 support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34737?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ifdc104b158afa6343e3aa6142ffa9591db209c4f Gerrit-Change-Number: 34737 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libgtpnl[master]: add IPv6 API for GTP tunnel
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34736?usp=email ) Change subject: add IPv6 API for GTP tunnel ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34736?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ic9c1a5cd791b285d214e7f2aeb76f8bf372e01c6 Gerrit-Change-Number: 34736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:28:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libgtpnl[master]: update to prepare for IPv6 support
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email ) Change subject: update to prepare for IPv6 support ...................................................................... Patch Set 1: (1 comment) File src/internal.h: https://gerrit.osmocom.org/c/libgtpnl/+/34734/comment/2a0611a2_5c748ec6 PS1, Line 22: } ip; given that we'll have an ip6 counterpart, naming this one "ip4" may be easier to understand for readers around the code. -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ifc7e3b03a723fb544d1c7b789101102b2c27b60e Gerrit-Change-Number: 34734 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:27:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libgtpnl[master]: add IPv6 support
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email ) Change subject: add IPv6 support ...................................................................... Patch Set 1: (4 comments) File include/linux/gtp.h: https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/909c69a6_2fe7781a PS1, Line 27: #define GTPA_SGSN_ADDRESS GTPA_PEER_ADDRESS /* maintain legacy attr name */ I'm not sure I'm following here. I don't see this GTPA_SGSN_ADDRESS being defined previously, hence not sure which legacy attr you talk about. If you would like to maintain legacy of GTPA_PEER_ADDRESS, I'd write it the other way: GTPA_SGSN_ADDRESS, #define GTPA_PEER_ADDRESS GTPA_SGSN_ADDRESS /* maintain legacy attr name */ File src/gtp-genl.c: https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/1f2861a8_72d678fb PS1, Line 60: mnl_attr_put(nlh, GTPA_PEER_ADDR6, sizeof(t->ip6.sgsn_addr), &t->ip6.sgsn_addr); why do we check for ANY_ADDR in ipv4 but not in ipv6? https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/430ba8c9_55dae7cb PS1, Line 220: } "default: return MNL_CB_ERROR;" ? File src/gtp.c: https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/d688434b_f7cf4aec PS1, Line 39: t->family = AF_INET; explain here with a comment that you add this here to maintain backward compat with older apps. -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b Gerrit-Change-Number: 34735 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:26:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: send UL/DL GPRS blocks over GSMTAP
by pespin 13 Oct '23

13 Oct '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34733?usp=email ) Change subject: layer23: send UL/DL GPRS blocks over GSMTAP ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I338205bee44fe182233efc5619a3d528cd07d932 Gerrit-Change-Number: 34733 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Oct 2023 11:15:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0