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

[S] Change in osmocom-bb[master]: [HACK] trxcon/l1sched: warn about incomplete UL PDTCH transmissions

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35768?usp=email ) Change subject: [HACK] trxcon/l1sched: warn about incomplete UL PDTCH transmissions ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35768?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: Id485c919ca87a9edfb8bc974d73fb88638bfc510 Gerrit-Change-Number: 35768 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 year, 4 months

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add ms power

by fixeria

Attention is currently required from: daniel, fixeria, matanp, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35747?usp=email ) Change subject: ctrl: Add ms power ...................................................................... Patch Set 7: (2 comments) File src/osmo-bsc/bts_trx_ts_lchan_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/35747/comment/0ef548bf_71d17c53 PS3, Line 2: * (C) 2013-2015 by Holger Hans Peter Freyther : * (C) 2013-2022 by > Ack I am not a Copyright expert, but this still does not look right to me. If this is the code you wrote, you should put your name and E-mail in the copyright header. It's usually Sysmocom employees who put `by sysmocom s.f.m.c. GmbH` here. https://gerrit.osmocom.org/c/osmo-bsc/+/35747/comment/f134f613_a328c67a PS3, Line 17: * You should have received a copy of the GNU Affero General Public License : No need to remove this whole part. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35747?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6f556b66011be6126d6bac31a14101ba37f81cc4 Gerrit-Change-Number: 35747 Gerrit-PatchSet: 7 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <axilirator(a)gmail.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: fixeria <axilirator(a)gmail.com> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Wed, 14 Feb 2024 10:40:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: matanp <matan1008(a)gmail.com> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libosmocore[master]: tests/vty: demonstrate a problem with optional-multi-choice

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email ) Change subject: tests/vty: demonstrate a problem with optional-multi-choice ...................................................................... tests/vty: demonstrate a problem with optional-multi-choice Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Related: b55f4d2df21b966c3953264d8961f259814f4650 --- M tests/vty/vty_transcript_test.c M tests/vty/vty_transcript_test.vty 2 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/35961/1 diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c index 5602c50..f4d3879 100644 --- a/tests/vty/vty_transcript_test.c +++ b/tests/vty/vty_transcript_test.c @@ -207,6 +207,14 @@ return CMD_SUCCESS; } +DEFUN(multi3, multi3_cmd, + "multi3 (foo|bar) [(one|two|three)]", + "multi3 test command\n" "foo\nbar\n" "1\n2\n3\n") +{ + vty_out(vty, "ok argc=%d%s%s%s", argc, argc ? " " : "", argc ? argv[0] : "", VTY_NEWLINE); + return CMD_SUCCESS; +} + #define X(f) (1 << f) enum { @@ -380,6 +388,7 @@ install_element_ve(&multi0_cmd); install_element_ve(&multi1_cmd); install_element_ve(&multi2_cmd); + install_element_ve(&multi3_cmd); install_element(CONFIG_NODE, &cfg_attr_test_cmd); install_node(&attr_test_node, NULL); diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index 7df2a60..33edb12 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -3,6 +3,7 @@ multi0 (one|two|three) multi1 ([one]|[two]|[three]) multi2 [(one|two|three)] + multi3 (foo|bar) [(one|two|three)] vty_transcript_test> multi0 ? one 1 @@ -67,6 +68,27 @@ vty_transcript_test> multi2 ok argc=0 +vty_transcript_test> multi3 ? + foo foo + bar bar + +vty_transcript_test> multi3 foo ? + [one] 1 + [two] 2 + [three] 3 + +vty_transcript_test> multi3 foo +ok argc=1 foo + +vty_transcript_test> multi3 bar +ok argc=1 bar + +vty_transcript_test> multi3 foo one +ok argc=2 foo one + +vty_transcript_test> multi3 bar three +ok argc=2 foo three + vty_transcript_test> multi0 thr ok argc=1 three @@ -76,6 +98,9 @@ vty_transcript_test> multi2 t % Ambiguous command. +vty_transcript_test> multi3 foo t +% Ambiguous command. + vty_transcript_test> single0 one ok argc=1 one -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35961?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: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 35961 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: config: Do not set up VRF

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35958?usp=email ) Change subject: config: Do not set up VRF ...................................................................... config: Do not set up VRF gtp_u_kmod won't configure the VRF if the node is not present. We don't want to use it for now, so disable it. Change-Id: Ia47a85e2d51e56368cc9940ef0e6faa41afe81e9 --- M config/sys.config 1 file changed, 17 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/config/sys.config b/config/sys.config index 6119e02..6183daf 100755 --- a/config/sys.config +++ b/config/sys.config @@ -51,11 +51,11 @@ %% Allow binding to an IP address that is nonlocal or does not (yet) exist (IP_FREEBIND): freebind, % Create gtp tundev with role SGSN: - {role, sgsn}, - {vrf, [{routes, [{{10, 180, 0, 0}, 16}]}%%, - %%{netdev, "upstream"} - ] - } + {role, sgsn}%, + %{vrf, [{routes, [{{10, 180, 0, 0}, 16}]}%%, + % %%{netdev, "upstream"} + % ] + %} ] }] } -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35958?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: Ia47a85e2d51e56368cc9940ef0e6faa41afe81e9 Gerrit-Change-Number: 35958 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: s2b: Announce proper GTPU Local Address during CreateSessionReq

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35960?usp=email ) Change subject: s2b: Announce proper GTPU Local Address during CreateSessionReq ...................................................................... s2b: Announce proper GTPU Local Address during CreateSessionReq Change-Id: I43ad4f9e59cb80e0016d9163364d9f202d0d0fb3 --- M config/sys.config M src/epdg_gtpc_s2b.erl M src/osmo_epdg_sup.erl 3 files changed, 45 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/config/sys.config b/config/sys.config index 6183daf..660aded 100755 --- a/config/sys.config +++ b/config/sys.config @@ -42,8 +42,8 @@ %% =========================================== {gtp_u_kmod, [ %% grx: Name used to log by the module. - {sockets, [{grx, [%% ip: IP Address assigned at the tunnel. TODO: not currently applied? - {ip, {192,0,2,16}}, + {sockets, [{grx, [%% ip: IP Address assigned at the tunnel, used as local GTP-U IP Address. + {ip, {127,0,0,2}}, %% Create the tun socket on a given netns: %%{netns, "mynetns"}, %% Bind tun socket to a particular interface (SO_BINDTODEVICE): diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index e795cd2..9b6d9ed 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -43,7 +43,7 @@ -include_lib("gtplib/include/gtp_packet.hrl"). %% API Function Exports --export([start_link/5]). +-export([start_link/6]). -export([terminate/2]). %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). @@ -63,12 +63,14 @@ -record(gtp_state, { socket, - laddr_str, + laddr_str :: string(), laddr :: inet:ip_address(), lport :: non_neg_integer(), - raddr_str, + raddr_str :: string(), raddr :: inet:ip_address(), rport :: non_neg_integer(), + laddr_gtpu_str :: string(), + laddr_gtpu :: inet:ip_address(), restart_counter :: 0..255, seq_no :: 0..16#ffffff, next_local_control_tei :: 0..16#ffffffff, @@ -93,8 +95,8 @@ bearers = sets:new() :: sets:set() }). -start_link(LocalAddr, LocalPort, RemoteAddr, RemotePort, Options) -> - gen_server:start_link({local, ?SERVER}, ?MODULE, [LocalAddr, LocalPort, RemoteAddr, RemotePort, Options], []). +start_link(LocalAddr, LocalPort, RemoteAddr, RemotePort, GtpuLocalIp, Options) -> + gen_server:start_link({local, ?SERVER}, ?MODULE, [LocalAddr, LocalPort, RemoteAddr, RemotePort, GtpuLocalIp, Options], []). peer_down(API, SvcName, {PeerRef, _} = Peer) -> % fixme: why do we still have ets here? @@ -104,10 +106,11 @@ init(State) -> lager:info("epdg_gtpc_s2b: init(): ~p", [State]), - [LocalAddr | [LocalPort | [RemoteAddr | [RemotePort | _]]]] = State, + [LocalAddr | [LocalPort | [RemoteAddr | [RemotePort | [GtpuLocalAddr | _]]]]] = State, lager:info("epdg_gtpc_s2b: Binding to IP ~s port ~p~n", [LocalAddr, LocalPort]), {ok, LocalAddrInet} = inet_parse:address(LocalAddr), {ok, RemoteAddrInet} = inet_parse:address(RemoteAddr), + {ok, GtpuLocalAddrInet} = inet_parse:address(GtpuLocalAddr), Opts = [ binary, {ip, LocalAddrInet}, @@ -127,6 +130,8 @@ raddr_str = RemoteAddr, raddr = RemoteAddrInet, rport = RemotePort, + laddr_gtpu_str = GtpuLocalAddr, + laddr_gtpu = GtpuLocalAddrInet, restart_counter = 0, seq_no = rand:uniform(16#FFFFFF), next_local_control_tei = rand:uniform(16#FFFFFFFE), @@ -457,6 +462,7 @@ apn = Apn, local_control_tei = LocalCtlTEI} = Sess, #gtp_state{laddr = LocalAddr, + laddr_gtpu = LocalAddrGtpu, restart_counter = RCnt, seq_no = SeqNo}) -> Bearer = gtp_session_default_bearer(Sess), @@ -472,7 +478,7 @@ instance = Bearer#gtp_bearer.ebi, interface_type = 31, %% "S2b-U ePDG GTP-U" key = Bearer#gtp_bearer.local_data_tei, - ipv4 = conv:ip_to_bin(LocalAddr) + ipv4 = conv:ip_to_bin(LocalAddrGtpu) } ], IEs = [#v2_recovery{restart_counter = RCnt}, @@ -512,7 +518,7 @@ gen_create_bearer_response(Req = #gtp{version = v2, type = create_bearer_request}, Sess = #gtp_session{remote_control_tei = RemoteCtlTEI}, GtpCause, - #gtp_state{laddr = LocalAddr, + #gtp_state{laddr_gtpu = LocalAddrGtpu, restart_counter = RCnt}) -> Bearer = gtp_session_default_bearer(Sess), BearersIE = [#v2_bearer_level_quality_of_service{ @@ -527,7 +533,7 @@ instance = 0, interface_type = 31, %% "S2b-U ePDG GTP-U" key = Bearer#gtp_bearer.local_data_tei, - ipv4 = conv:ip_to_bin(LocalAddr) + ipv4 = conv:ip_to_bin(LocalAddrGtpu) } ], IEs = [#v2_cause{v2_cause = GtpCause}, diff --git a/src/osmo_epdg_sup.erl b/src/osmo_epdg_sup.erl index 4d004e2..871a277 100644 --- a/src/osmo_epdg_sup.erl +++ b/src/osmo_epdg_sup.erl @@ -23,6 +23,7 @@ GtpcLocalPort = application:get_env(?ENV_APP_NAME, gtpc_local_port, ?ENV_DEFAULT_GTPC_LOCAL_PORT), GtpcRemoteIp = application:get_env(?ENV_APP_NAME, gtpc_remote_ip, ?ENV_DEFAULT_GTPC_REMOTE_IP), GtpcRemotePort = application:get_env(?ENV_APP_NAME, gtpc_remote_port, ?ENV_DEFAULT_GTPC_REMOTE_PORT), + GtpuLocalIp = get_config_gtpu_local_ip_addr(), %% AAA Server processes: AAADiaSWxServer = {aaa_diameter_swx, {aaa_diameter_swx,start_link,[]}, permanent, @@ -40,7 +41,7 @@ worker, [aaa_diameter_swm]}, %% ePDG processes: - GtpcServer = {epdg_gtpc_s2b, {epdg_gtpc_s2b,start_link, [GtpcLocalIp, GtpcLocalPort, GtpcRemoteIp, GtpcRemotePort, []]}, + GtpcServer = {epdg_gtpc_s2b, {epdg_gtpc_s2b,start_link, [GtpcLocalIp, GtpcLocalPort, GtpcRemoteIp, GtpcRemotePort, GtpuLocalIp, []]}, permanent, 5000, worker, @@ -56,3 +57,20 @@ worker, [epdg_diameter_swm]}, {ok, { {one_for_all, 5, 10}, [AAADiaSWxServer, AAADiaS6bServer, AAADiaSWmServer, GtpcServer, GsupServer, DiaSWmServer]} }. + +% Returns GTP-U local IP address to use, as a string. +get_config_gtpu_local_ip_addr() -> + GtpuKmodSockets = application:get_env(gtp_u_kmod, sockets, []), + [GtpuKmodSocket | _] = GtpuKmodSockets, + {_GtpuKmodName, GtpuKmodSockOpts} = GtpuKmodSocket, + case proplists:get_value(ip, GtpuKmodSockOpts, undefined) of + undefined -> + GtpcLocalIp = application:get_env(?ENV_APP_NAME, gtpc_local_ip, ?ENV_DEFAULT_GTPC_LOCAL_IP), + lager:notice("Config for GTP-U Local IP Address not found, using GTP-C ~p as fallback~n", [GtpcLocalIp]), + GtpcLocalIp; + IP -> + % GtpuLocalIp is in format {A,B,C,D}, convert it to string: + GtpuLocalIp = inet:ntoa(IP), + lager:info("Config for GTP-U Local IP Address: ~p~n", [GtpuLocalIp]), + GtpuLocalIp + end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35960?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: I43ad4f9e59cb80e0016d9163364d9f202d0d0fb3 Gerrit-Change-Number: 35960 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: s2b: Announce proper GTPU Local Address during CreateSessionReq

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35960?usp=email ) Change subject: s2b: Announce proper GTPU Local Address during CreateSessionReq ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35960?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: I43ad4f9e59cb80e0016d9163364d9f202d0d0fb3 Gerrit-Change-Number: 35960 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Feb 2024 18:38:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: config: Do not set up VRF

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35958?usp=email ) Change subject: config: Do not set up VRF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35958?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: Ia47a85e2d51e56368cc9940ef0e6faa41afe81e9 Gerrit-Change-Number: 35958 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Feb 2024 18:31:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: s2b: Announce proper GTPU Local Address during CreateSessionReq

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35960?usp=email ) Change subject: s2b: Announce proper GTPU Local Address during CreateSessionReq ...................................................................... s2b: Announce proper GTPU Local Address during CreateSessionReq Change-Id: I43ad4f9e59cb80e0016d9163364d9f202d0d0fb3 --- M config/sys.config M src/epdg_gtpc_s2b.erl M src/osmo_epdg_sup.erl 3 files changed, 45 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/60/35960/1 diff --git a/config/sys.config b/config/sys.config index 6183daf..660aded 100755 --- a/config/sys.config +++ b/config/sys.config @@ -42,8 +42,8 @@ %% =========================================== {gtp_u_kmod, [ %% grx: Name used to log by the module. - {sockets, [{grx, [%% ip: IP Address assigned at the tunnel. TODO: not currently applied? - {ip, {192,0,2,16}}, + {sockets, [{grx, [%% ip: IP Address assigned at the tunnel, used as local GTP-U IP Address. + {ip, {127,0,0,2}}, %% Create the tun socket on a given netns: %%{netns, "mynetns"}, %% Bind tun socket to a particular interface (SO_BINDTODEVICE): diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index e795cd2..9b6d9ed 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -43,7 +43,7 @@ -include_lib("gtplib/include/gtp_packet.hrl"). %% API Function Exports --export([start_link/5]). +-export([start_link/6]). -export([terminate/2]). %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). @@ -63,12 +63,14 @@ -record(gtp_state, { socket, - laddr_str, + laddr_str :: string(), laddr :: inet:ip_address(), lport :: non_neg_integer(), - raddr_str, + raddr_str :: string(), raddr :: inet:ip_address(), rport :: non_neg_integer(), + laddr_gtpu_str :: string(), + laddr_gtpu :: inet:ip_address(), restart_counter :: 0..255, seq_no :: 0..16#ffffff, next_local_control_tei :: 0..16#ffffffff, @@ -93,8 +95,8 @@ bearers = sets:new() :: sets:set() }). -start_link(LocalAddr, LocalPort, RemoteAddr, RemotePort, Options) -> - gen_server:start_link({local, ?SERVER}, ?MODULE, [LocalAddr, LocalPort, RemoteAddr, RemotePort, Options], []). +start_link(LocalAddr, LocalPort, RemoteAddr, RemotePort, GtpuLocalIp, Options) -> + gen_server:start_link({local, ?SERVER}, ?MODULE, [LocalAddr, LocalPort, RemoteAddr, RemotePort, GtpuLocalIp, Options], []). peer_down(API, SvcName, {PeerRef, _} = Peer) -> % fixme: why do we still have ets here? @@ -104,10 +106,11 @@ init(State) -> lager:info("epdg_gtpc_s2b: init(): ~p", [State]), - [LocalAddr | [LocalPort | [RemoteAddr | [RemotePort | _]]]] = State, + [LocalAddr | [LocalPort | [RemoteAddr | [RemotePort | [GtpuLocalAddr | _]]]]] = State, lager:info("epdg_gtpc_s2b: Binding to IP ~s port ~p~n", [LocalAddr, LocalPort]), {ok, LocalAddrInet} = inet_parse:address(LocalAddr), {ok, RemoteAddrInet} = inet_parse:address(RemoteAddr), + {ok, GtpuLocalAddrInet} = inet_parse:address(GtpuLocalAddr), Opts = [ binary, {ip, LocalAddrInet}, @@ -127,6 +130,8 @@ raddr_str = RemoteAddr, raddr = RemoteAddrInet, rport = RemotePort, + laddr_gtpu_str = GtpuLocalAddr, + laddr_gtpu = GtpuLocalAddrInet, restart_counter = 0, seq_no = rand:uniform(16#FFFFFF), next_local_control_tei = rand:uniform(16#FFFFFFFE), @@ -457,6 +462,7 @@ apn = Apn, local_control_tei = LocalCtlTEI} = Sess, #gtp_state{laddr = LocalAddr, + laddr_gtpu = LocalAddrGtpu, restart_counter = RCnt, seq_no = SeqNo}) -> Bearer = gtp_session_default_bearer(Sess), @@ -472,7 +478,7 @@ instance = Bearer#gtp_bearer.ebi, interface_type = 31, %% "S2b-U ePDG GTP-U" key = Bearer#gtp_bearer.local_data_tei, - ipv4 = conv:ip_to_bin(LocalAddr) + ipv4 = conv:ip_to_bin(LocalAddrGtpu) } ], IEs = [#v2_recovery{restart_counter = RCnt}, @@ -512,7 +518,7 @@ gen_create_bearer_response(Req = #gtp{version = v2, type = create_bearer_request}, Sess = #gtp_session{remote_control_tei = RemoteCtlTEI}, GtpCause, - #gtp_state{laddr = LocalAddr, + #gtp_state{laddr_gtpu = LocalAddrGtpu, restart_counter = RCnt}) -> Bearer = gtp_session_default_bearer(Sess), BearersIE = [#v2_bearer_level_quality_of_service{ @@ -527,7 +533,7 @@ instance = 0, interface_type = 31, %% "S2b-U ePDG GTP-U" key = Bearer#gtp_bearer.local_data_tei, - ipv4 = conv:ip_to_bin(LocalAddr) + ipv4 = conv:ip_to_bin(LocalAddrGtpu) } ], IEs = [#v2_cause{v2_cause = GtpCause}, diff --git a/src/osmo_epdg_sup.erl b/src/osmo_epdg_sup.erl index 4d004e2..871a277 100644 --- a/src/osmo_epdg_sup.erl +++ b/src/osmo_epdg_sup.erl @@ -23,6 +23,7 @@ GtpcLocalPort = application:get_env(?ENV_APP_NAME, gtpc_local_port, ?ENV_DEFAULT_GTPC_LOCAL_PORT), GtpcRemoteIp = application:get_env(?ENV_APP_NAME, gtpc_remote_ip, ?ENV_DEFAULT_GTPC_REMOTE_IP), GtpcRemotePort = application:get_env(?ENV_APP_NAME, gtpc_remote_port, ?ENV_DEFAULT_GTPC_REMOTE_PORT), + GtpuLocalIp = get_config_gtpu_local_ip_addr(), %% AAA Server processes: AAADiaSWxServer = {aaa_diameter_swx, {aaa_diameter_swx,start_link,[]}, permanent, @@ -40,7 +41,7 @@ worker, [aaa_diameter_swm]}, %% ePDG processes: - GtpcServer = {epdg_gtpc_s2b, {epdg_gtpc_s2b,start_link, [GtpcLocalIp, GtpcLocalPort, GtpcRemoteIp, GtpcRemotePort, []]}, + GtpcServer = {epdg_gtpc_s2b, {epdg_gtpc_s2b,start_link, [GtpcLocalIp, GtpcLocalPort, GtpcRemoteIp, GtpcRemotePort, GtpuLocalIp, []]}, permanent, 5000, worker, @@ -56,3 +57,20 @@ worker, [epdg_diameter_swm]}, {ok, { {one_for_all, 5, 10}, [AAADiaSWxServer, AAADiaS6bServer, AAADiaSWmServer, GtpcServer, GsupServer, DiaSWmServer]} }. + +% Returns GTP-U local IP address to use, as a string. +get_config_gtpu_local_ip_addr() -> + GtpuKmodSockets = application:get_env(gtp_u_kmod, sockets, []), + [GtpuKmodSocket | _] = GtpuKmodSockets, + {_GtpuKmodName, GtpuKmodSockOpts} = GtpuKmodSocket, + case proplists:get_value(ip, GtpuKmodSockOpts, undefined) of + undefined -> + GtpcLocalIp = application:get_env(?ENV_APP_NAME, gtpc_local_ip, ?ENV_DEFAULT_GTPC_LOCAL_IP), + lager:notice("Config for GTP-U Local IP Address not found, using GTP-C ~p as fallback~n", [GtpcLocalIp]), + GtpcLocalIp; + IP -> + % GtpuLocalIp is in format {A,B,C,D}, convert it to string: + GtpuLocalIp = inet:ntoa(IP), + lager:info("Config for GTP-U Local IP Address: ~p~n", [GtpuLocalIp]), + GtpuLocalIp + end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35960?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: I43ad4f9e59cb80e0016d9163364d9f202d0d0fb3 Gerrit-Change-Number: 35960 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: WIP: tun

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35959?usp=email ) Change subject: WIP: tun ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35959?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: I216c17426960318a9807058c81529331a8fe2503 Gerrit-Change-Number: 35959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: WIP: tun

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35959?usp=email ) Change subject: WIP: tun ...................................................................... WIP: tun Change-Id: I216c17426960318a9807058c81529331a8fe2503 --- M Makefile M rebar.config 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/59/35959/1 diff --git a/Makefile b/Makefile index 0470458..270e1b2 100644 --- a/Makefile +++ b/Makefile @@ -23,3 +23,11 @@ else rm -f src/diameter_*.erl endif + +NETDEV=gtp0 + +pespin-test: + echo -n 'module gtp +p' | sudo tee /sys/kernel/debug/dynamic_debug/control + sudo ip link del $(NETDEV) || true + sudo rebar3 shell --config ./config/sys.config || true + echo -n 'module gtp -p' | sudo tee /sys/kernel/debug/dynamic_debug/control diff --git a/rebar.config b/rebar.config index 8541410..a208964 100644 --- a/rebar.config +++ b/rebar.config @@ -5,7 +5,7 @@ {deps, [ {lager, {git, "https://github.com/erlang-lager/lager", {tag, "3.9.2"}}}, {gtplib, "3.2.0"}, - {gtp_u_kmod, {git, "https://github.com/osmocom/gtp_u_kmod", {branch, "osmocom/master"}}}, + {gtp_u_kmod, {git, "https://github.com/osmocom/gtp_u_kmod", {branch, "pespin/master"}}}, {osmo_ss7, {git, "https://gitea.osmocom.org/erlang/osmo_ss7", {ref, "9f294d3612f998860004820d1d85b4264721577b"}}}, {osmo_gsup, {git, "https://gerrit.osmocom.org/erlang/osmo_gsup", {branch, "osmocom/epdg"}}} ]}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35959?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: I216c17426960318a9807058c81529331a8fe2503 Gerrit-Change-Number: 35959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024