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

[S] Change in ...osmo-s1gw[master]: sctp_server: fix terminate/2: match any Reason

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37087?usp=email ) Change subject: sctp_server: fix terminate/2: match any Reason ...................................................................... sctp_server: fix terminate/2: match any Reason Change-Id: I57f1604ef3febee6c330521a044271988110cf2a --- M src/sctp_server.erl 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 4ba49eb..a2b722a 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -102,8 +102,8 @@ {noreply, State}. -terminate(shutdown, State) -> - logger:notice("Terminating ~p", [?MODULE]), +terminate(Reason, State) -> + logger:notice("Terminating, reason ~p", [Reason]), close_conns(State), gen_sctp:close(State#server_state.sock), ok. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37087?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I57f1604ef3febee6c330521a044271988110cf2a Gerrit-Change-Number: 37087 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in ...osmo-s1gw[master]: config/sys.config: add default environment params

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37089?usp=email ) Change subject: config/sys.config: add default environment params ...................................................................... config/sys.config: add default environment params Change-Id: Ie5ec9f62d77407152e18ea3c20cf401151fa6aea --- M config/sys.config M src/osmo_s1gw_sup.erl 2 files changed, 22 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/config/sys.config b/config/sys.config index dcace60..8055631 100644 --- a/config/sys.config +++ b/config/sys.config @@ -1,6 +1,16 @@ %% -*- erlang -*- -[{kernel, +[%% =========================================== + %% application config + %% =========================================== + {osmo_s1gw, + [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections + {mme_addr, "127.0.2.1"} %% MME address for outgoing connections + ]}, + %% =========================================== + %% kernel config + %% =========================================== + {kernel, [{logger_level, info}, {logger, [{handler, default, logger_std_h, diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index a62f266..4c93756 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -8,9 +8,9 @@ -define(SERVER, ?MODULE). -define(ENV_APP_NAME, osmo_s1gw). --define(ENV_DEFAULT_S1GW_BIND_ADDR, "0.0.0.0"). +-define(ENV_DEFAULT_S1GW_BIND_ADDR, "127.0.1.1"). -define(ENV_DEFAULT_S1GW_BIND_PORT, ?S1AP_PORT). --define(ENV_DEFAULT_MME_ADDR, "127.0.0.1"). +-define(ENV_DEFAULT_MME_ADDR, "127.0.2.1"). -define(ENV_DEFAULT_MME_PORT, ?S1AP_PORT). %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37089?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie5ec9f62d77407152e18ea3c20cf401151fa6aea Gerrit-Change-Number: 37089 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: implement patching of E-RAB SETUP REQ/RSP

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37088?usp=email ) Change subject: s1ap_proxy: implement patching of E-RAB SETUP REQ/RSP ...................................................................... s1ap_proxy: implement patching of E-RAB SETUP REQ/RSP Change-Id: I88cb261d93b56a4e0ca06ad1d676d1ac16d115bb --- M src/s1ap_proxy.erl A test/s1ap_proxy_test.erl 2 files changed, 209 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 62701ef..a78f084 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -1,17 +1,25 @@ -module(s1ap_proxy). --export([handle_pdu/1]). +-export([handle_pdu/1, + encode_pdu/1, + decode_pdu/1]). + +-include("S1AP-PDU-Descriptions.hrl"). +-include("S1AP-PDU-Contents.hrl"). +-include("S1AP-Containers.hrl"). +-include("S1AP-Constants.hrl"). %% ------------------------------------------------------------------ %% public API %% ------------------------------------------------------------------ %% Process an S1AP PDU -handle_pdu(Data) -> +-spec handle_pdu(binary()) -> binary(). +handle_pdu(Data) when is_binary(Data) -> case decode_pdu(Data) of {ok, Pdu} -> logger:info("S1AP PDU: ~p", [Pdu]), - Data; + handle_pdu(Data, Pdu); {error, {asn1, Error}} -> logger:error("S1AP PDU decoding failed: ~p", [Error]), Data @@ -22,10 +30,111 @@ %% private API %% ------------------------------------------------------------------ +%% Encode an S1AP PDU +-spec encode_pdu(tuple()) -> {ok, binary()} | + {error, {asn1, tuple()}}. +encode_pdu(Pdu) -> + 'S1AP-PDU-Descriptions':encode('S1AP-PDU', Pdu). + + %% Decode an S1AP PDU -spec decode_pdu(binary()) -> {ok, tuple()} | {error, {asn1, tuple()}}. decode_pdu(Data) -> 'S1AP-PDU-Descriptions':decode('S1AP-PDU', Data). + +%% Helper function for handle_pdu/2. +%% Attempt to encode a new (modified) S1AP PDU, +%% return a new binary() on success or Data on error. +handle_pdu_new(Data, NewPdu) -> + case encode_pdu(NewPdu) of + {ok, NewData} -> + NewData; + {error, {asn1, Error}} -> + logger:error("S1AP PDU encoding failed: ~p", [Error]), + Data + end. + + +%% E-RAB SETUP REQUEST +handle_pdu(Data, {Outcome = initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-E-RABSetup', + value = Content} = Pdu}) -> + logger:debug("Patching E-RAB SETUP REQUEST"), + IEs = handle_ies(Content#'E-RABSetupRequest'.protocolIEs, + ?'id-E-RABToBeSetupListBearerSUReq'), + NewContent = Content#'E-RABSetupRequest'{protocolIEs = IEs}, + handle_pdu_new(Data, {Outcome, Pdu#'InitiatingMessage'{value = NewContent}}); + +%% E-RAB SETUP RESPONSE +handle_pdu(Data, {Outcome = successfulOutcome, + #'SuccessfulOutcome'{procedureCode = ?'id-E-RABSetup', + value = Content} = Pdu}) -> + logger:debug("Patching E-RAB SETUP RESPONSE"), + IEs = handle_ies(Content#'E-RABSetupResponse'.protocolIEs, + ?'id-E-RABSetupListBearerSURes'), + NewContent = Content#'E-RABSetupResponse'{protocolIEs = IEs}, + handle_pdu_new(Data, {Outcome, Pdu#'SuccessfulOutcome'{value = NewContent}}); + +%% Proxy all other messages unmodified +handle_pdu(Data, _Pdu) -> + Data. + + +%% Handle a single IE (Information Element) +-spec handle_ie(tuple()) -> tuple(). + +%% E-RAB SETUP REQUEST related IEs +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupListBearerSUReq', + value = Content}) -> + %% This IE contains a list of BearerSUReq, so patch inner IEs + handle_ies(Content, ?'id-E-RABToBeSetupItemBearerSUReq'); + +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemBearerSUReq', + value = Content}) -> + Content#'E-RABToBeSetupItemBearerSUReq'{transportLayerAddress = transp_layer_addr()}; + +%% E-RAB SETUP RESPONSE related IEs +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupListBearerSURes', + value = Content}) -> + %% This IE contains a list of BearerSURes, so patch inner IEs + handle_ies(Content, ?'id-E-RABSetupItemBearerSURes'); + +handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupItemBearerSURes', + value = Content}) -> + Content#'E-RABSetupItemBearerSURes'{transportLayerAddress = transp_layer_addr()}; + +%% Catch-all variant, which should not be called normally +handle_ie(#'ProtocolIE-Field'{value = Content} = IE) -> + logger:error("[BUG] Unhandled S1AP IE: ~p", [IE]), + Content. + + +%% Iterate over the given list of 'ProtocolIE-Field' IEs, +%% calling function handle_ie/1 for IEs matching the given IEI. +-spec handle_ies(list(), integer()) -> list(). +handle_ies(IEs, IEI) -> + handle_ies([], IEs, IEI). + +handle_ies(Acc, [IE | IEs], IEI) -> + case IE of + #'ProtocolIE-Field'{id = IEI} -> + NewIE = IE#'ProtocolIE-Field'{value = handle_ie(IE)}, + handle_ies([NewIE | Acc], IEs, IEI); + _ -> + handle_ies([IE | Acc], IEs, IEI) + end; + +handle_ies(Acc, [], _) -> + lists:reverse(Acc). + + +%% GTP-U IP address (TransportLayerAddress) to be used while patching +transp_layer_addr() -> + AddrStr = application:get_env(osmo_s1gw, transp_layer_addr, "255.255.255.255"), + {ok, Addr} = inet:parse_address(AddrStr), + %% sadly, there exists inet:ntoa/1, but not inet:aton/1 + list_to_binary(tuple_to_list(Addr)). + %% vim:set ts=4 sw=4 et: diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl new file mode 100644 index 0000000..408f468 --- /dev/null +++ b/test/s1ap_proxy_test.erl @@ -0,0 +1,88 @@ +-module(s1ap_proxy_test). + +-include_lib("eunit/include/eunit.hrl"). + +%% ------------------------------------------------------------------ +%% testcases +%% ------------------------------------------------------------------ + +%% S1 SETUP REQUEST +s1_setup_req_pdu() -> + << 16#00, 16#11, 16#00, 16#1a, 16#00, 16#00, 16#02, 16#00, + 16#3b, 16#40, 16#08, 16#00, 16#00, 16#f1, 16#10, 16#00, + 16#00, 16#00, 16#00, 16#00, 16#40, 16#00, 16#07, 16#00, + 16#0c, 16#0e, 16#40, 16#00, 16#f1, 16#10 + >>. + +s1_setup_req_test() -> + OrigData = s1_setup_req_pdu(), + %% Expect the PDU to be proxied unmodified + ?assertEqual(OrigData, s1ap_proxy:handle_pdu(OrigData)). + + +%% E-RAB SETUP REQUEST +e_rab_setup_req_pdu(TLA, TEID) when is_binary(TLA), + is_binary(TEID) -> + << 16#00, 16#05, 16#00, 16#80, 16#9b, 16#00, 16#00, 16#03, + 16#00, 16#00, 16#00, 16#02, 16#00, 16#07, 16#00, 16#08, + 16#00, 16#02, 16#00, 16#09, 16#00, 16#10, 16#00, 16#80, + 16#87, 16#00, 16#00, 16#11, 16#00, 16#80, 16#81, 16#0c, + 16#00, 16#05, 16#04, 16#0f, 16#80, + TLA/bytes, %% transportLayerAddress (IPv4) + TEID/bytes, %% GTP-TEID + 16#72, 16#27, 16#c8, + 16#1a, 16#bc, 16#ec, 16#11, 16#62, 16#54, 16#c1, 16#01, + 16#05, 16#04, 16#03, 16#69, 16#6d, 16#73, 16#05, 16#01, + 16#c0, 16#a8, 16#65, 16#02, 16#5e, 16#02, 16#b3, 16#8c, + 16#58, 16#32, 16#27, 16#54, 16#80, 16#80, 16#21, 16#10, + 16#02, 16#00, 16#00, 16#10, 16#81, 16#06, 16#08, 16#08, + 16#08, 16#08, 16#83, 16#06, 16#08, 16#08, 16#04, 16#04, + 16#00, 16#0d, 16#04, 16#08, 16#08, 16#08, 16#08, 16#00, + 16#0d, 16#04, 16#08, 16#08, 16#04, 16#04, 16#00, 16#03, + 16#10, 16#20, 16#01, 16#48, 16#60, 16#48, 16#60, 16#00, + 16#00, 16#00, 16#00, 16#00, 16#00, 16#00, 16#00, 16#88, + 16#88, 16#00, 16#03, 16#10, 16#20, 16#01, 16#48, 16#60, + 16#48, 16#60, 16#00, 16#00, 16#00, 16#00, 16#00, 16#00, + 16#00, 16#00, 16#88, 16#44, 16#00, 16#0c, 16#04, 16#ac, + 16#16, 16#00, 16#15, 16#00, 16#10, 16#02, 16#05, 16#78 + >>. + +e_rab_setup_req_test() -> + %% Original input data + TEID = << 16#00, 16#00, 16#00, 16#18 >>, + OrigTLA = << 16#ac, 16#16, 16#00, 16#06 >>, + OrigData = e_rab_setup_req_pdu(OrigTLA, TEID), + + %% Expected output data + ExpTLA = << 16#7f, 16#00, 16#00, 16#01 >>, + ExpData = e_rab_setup_req_pdu(ExpTLA, TEID), + + application:set_env(osmo_s1gw, transp_layer_addr, "127.0.0.1"), + ?assertEqual(ExpData, s1ap_proxy:handle_pdu(OrigData)). + + +%% E-RAB SETUP RESPONSE +e_rab_setup_rsp_pdu(TLA, TEID) when is_binary(TLA), + is_binary(TEID) -> + << 16#20, 16#05, 16#00, 16#22, 16#00, 16#00, 16#03, 16#00, + 16#00, 16#40, 16#02, 16#00, 16#07, 16#00, 16#08, 16#40, + 16#02, 16#00, 16#09, 16#00, 16#1c, 16#40, 16#0f, 16#00, + 16#00, 16#27, 16#40, 16#0a, 16#0c, 16#1f, + TLA/bytes, %% transportLayerAddress (IPv4) + TEID/bytes %% GTP-TEID + >>. + +e_rab_setup_rsp_test() -> + %% Original input data + TEID = << 16#6c, 16#05, 16#bf, 16#56 >>, + OrigTLA = << 16#c0, 16#a8, 16#68, 16#a7 >>, + OrigData = e_rab_setup_rsp_pdu(OrigTLA, TEID), + + %% Expected output data + ExpTLA = << 16#7f, 16#00, 16#00, 16#01 >>, + ExpData = e_rab_setup_rsp_pdu(ExpTLA, TEID), + + application:set_env(osmo_s1gw, transp_layer_addr, "127.0.0.1"), + ?assertEqual(ExpData, s1ap_proxy:handle_pdu(OrigData)). + +%% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37088?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I88cb261d93b56a4e0ca06ad1d676d1ac16d115bb Gerrit-Change-Number: 37088 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: sctp_client: support explicitly setting local address

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37090?usp=email ) Change subject: sctp_client: support explicitly setting local address ...................................................................... sctp_client: support explicitly setting local address Change-Id: I96c0cecb855d11066cbb1f7e43f70fb532e473f3 --- M config/sys.config M src/osmo_s1gw_sup.erl M src/sctp_client.erl M src/sctp_proxy.erl 4 files changed, 44 insertions(+), 20 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/config/sys.config b/config/sys.config index 8055631..6904d65 100644 --- a/config/sys.config +++ b/config/sys.config @@ -1,15 +1,23 @@ %% -*- erlang -*- -[%% =========================================== +[%% ================================================================================ %% application config - %% =========================================== + %% + %% eNB S1GW + %% +-----+ +----------------+ + %% | ... | --> | s1gw_bind_addr | MME + %% +-----+ +----------------+ +-----------------+ + %% | mme_loc_addr | --> | mme_rem_addr | + %% +----------------+ +-----------------+ + %% ================================================================================ {osmo_s1gw, [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections - {mme_addr, "127.0.2.1"} %% MME address for outgoing connections + {mme_loc_addr, "127.0.2.1"}, %% local address for outgoing connections to the MME + {mme_rem_addr, "127.0.2.10"} %% remote address for outgoing connections to the MME ]}, - %% =========================================== + %% ================================================================================ %% kernel config - %% =========================================== + %% ================================================================================ {kernel, [{logger_level, info}, {logger, diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 4c93756..87ec9bf 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -10,8 +10,9 @@ -define(ENV_APP_NAME, osmo_s1gw). -define(ENV_DEFAULT_S1GW_BIND_ADDR, "127.0.1.1"). -define(ENV_DEFAULT_S1GW_BIND_PORT, ?S1AP_PORT). --define(ENV_DEFAULT_MME_ADDR, "127.0.2.1"). --define(ENV_DEFAULT_MME_PORT, ?S1AP_PORT). +-define(ENV_DEFAULT_MME_LOC_ADDR, "127.0.2.1"). +-define(ENV_DEFAULT_MME_REM_ADDR, "127.0.2.10"). +-define(ENV_DEFAULT_MME_REM_PORT, ?S1AP_PORT). %% ------------------------------------------------------------------ %% supervisor API @@ -24,11 +25,12 @@ init([]) -> S1GWBindAddr = get_env(s1gw_bind_addr, ?ENV_DEFAULT_S1GW_BIND_ADDR), S1GWBindPort = get_env(s1gw_bind_port, ?ENV_DEFAULT_S1GW_BIND_PORT), - MmeAddr = get_env(mme_addr, ?ENV_DEFAULT_MME_ADDR), - MmePort = get_env(mme_port, ?ENV_DEFAULT_MME_PORT), + MmeLocAddr = get_env(mme_loc_addr, ?ENV_DEFAULT_MME_LOC_ADDR), + MmeRemAddr = get_env(mme_rem_addr, ?ENV_DEFAULT_MME_REM_ADDR), + MmeRemPort = get_env(mme_rem_port, ?ENV_DEFAULT_MME_REM_PORT), SctpServer = {sctp_server, {sctp_server, start_link, [S1GWBindAddr, S1GWBindPort, - {MmeAddr, MmePort}]}, + {{MmeLocAddr, MmeRemAddr}, MmeRemPort}]}, permanent, 5000, worker, diff --git a/src/sctp_client.erl b/src/sctp_client.erl index 908afcd..fe96f30 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -16,15 +16,24 @@ %% ------------------------------------------------------------------ connect() -> - connect(localhost). + connect({any, localhost}). -connect(Host) -> - connect(Host, ?S1AP_PORT). +connect(LocRemAddr) -> + connect(LocRemAddr, ?S1AP_PORT). -connect(Host, Port) -> - {ok, Sock} = gen_sctp:open([{type, seqpacket}, +connect({LocAddrStr, RemAddr}, Port) when is_list(LocAddrStr) -> + {ok, LocAddr} = inet:parse_address(LocAddrStr), + connect({LocAddr, RemAddr}, Port); + +connect({LocAddr, RemAddrStr}, Port) when is_list(RemAddrStr) -> + {ok, RemAddr} = inet:parse_address(RemAddrStr), + connect({LocAddr, RemAddr}, Port); + +connect({LocAddr, RemAddr}, Port) -> + {ok, Sock} = gen_sctp:open([{ip, LocAddr}, + {type, seqpacket}, {active, true}]), - gen_sctp:connect_init(Sock, Host, Port, []), + gen_sctp:connect_init(Sock, RemAddr, Port, []), {ok, Sock}. diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 43cb081..2cc6165 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -34,10 +34,6 @@ %% gen_statem API %% ------------------------------------------------------------------ -init([Aid, MmeAddrStr, MmePort]) when is_list(MmeAddrStr) -> - {ok, MmeAddr} = inet:parse_address(MmeAddrStr), - init([Aid, MmeAddr, MmePort]); - init([Aid, MmeAddr, MmePort]) -> {ok, connecting, #{enb_aid => Aid, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I96c0cecb855d11066cbb1f7e43f70fb532e473f3 Gerrit-Change-Number: 37090 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: properly patch transportLayerAddress

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37091?usp=email ) Change subject: s1ap_proxy: properly patch transportLayerAddress ...................................................................... s1ap_proxy: properly patch transportLayerAddress Change-Id: Iffcf6842147bcbc665689196c5ded6dfa1a066fa --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 20 insertions(+), 6 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index a78f084..48f3565 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -93,7 +93,9 @@ handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemBearerSUReq', value = Content}) -> - Content#'E-RABToBeSetupItemBearerSUReq'{transportLayerAddress = transp_layer_addr()}; + %% eNB -> MME direction: we pass our MME facing local address + TLA = transp_layer_addr(mme_loc_addr), + Content#'E-RABToBeSetupItemBearerSUReq'{transportLayerAddress = TLA}; %% E-RAB SETUP RESPONSE related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupListBearerSURes', @@ -103,7 +105,9 @@ handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupItemBearerSURes', value = Content}) -> - Content#'E-RABSetupItemBearerSURes'{transportLayerAddress = transp_layer_addr()}; + %% MME -> eNB direction: we pass our eNB facing local address + TLA = transp_layer_addr(s1gw_bind_addr), + Content#'E-RABSetupItemBearerSURes'{transportLayerAddress = TLA}; %% Catch-all variant, which should not be called normally handle_ie(#'ProtocolIE-Field'{value = Content} = IE) -> @@ -131,8 +135,9 @@ %% GTP-U IP address (TransportLayerAddress) to be used while patching -transp_layer_addr() -> - AddrStr = application:get_env(osmo_s1gw, transp_layer_addr, "255.255.255.255"), +-spec transp_layer_addr(atom()) -> binary(). +transp_layer_addr(EnvParam) -> + {ok, AddrStr} = application:get_env(osmo_s1gw, EnvParam), {ok, Addr} = inet:parse_address(AddrStr), %% sadly, there exists inet:ntoa/1, but not inet:aton/1 list_to_binary(tuple_to_list(Addr)). diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 408f468..0c4bbbf 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -57,7 +57,7 @@ ExpTLA = << 16#7f, 16#00, 16#00, 16#01 >>, ExpData = e_rab_setup_req_pdu(ExpTLA, TEID), - application:set_env(osmo_s1gw, transp_layer_addr, "127.0.0.1"), + application:set_env(osmo_s1gw, mme_loc_addr, "127.0.0.1"), ?assertEqual(ExpData, s1ap_proxy:handle_pdu(OrigData)). @@ -82,7 +82,7 @@ ExpTLA = << 16#7f, 16#00, 16#00, 16#01 >>, ExpData = e_rab_setup_rsp_pdu(ExpTLA, TEID), - application:set_env(osmo_s1gw, transp_layer_addr, "127.0.0.1"), + application:set_env(osmo_s1gw, s1gw_bind_addr, "127.0.0.1"), ?assertEqual(ExpData, s1ap_proxy:handle_pdu(OrigData)). %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iffcf6842147bcbc665689196c5ded6dfa1a066fa Gerrit-Change-Number: 37091 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in ...osmo-s1gw[master]: osmo_s1gw: add main/1 for rebar's escriptize target

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37092?usp=email ) Change subject: osmo_s1gw: add main/1 for rebar's escriptize target ...................................................................... osmo_s1gw: add main/1 for rebar's escriptize target Change-Id: Icb20a3c32fe4236522ccbc83d322b248a074580c --- A src/osmo_s1gw.erl 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/osmo_s1gw.erl b/src/osmo_s1gw.erl new file mode 100644 index 0000000..737fc16 --- /dev/null +++ b/src/osmo_s1gw.erl @@ -0,0 +1,9 @@ +-module(osmo_s1gw). + +-export([main/1]). + +main(_Args) -> + application:ensure_all_started(?MODULE), + timer:sleep(infinity). + +%% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icb20a3c32fe4236522ccbc83d322b248a074580c Gerrit-Change-Number: 37092 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in ...osmo-s1gw[master]: Move S1AP constants into a header file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37083?usp=email ) Change subject: Move S1AP constants into a header file ...................................................................... Move S1AP constants into a header file Change-Id: I8f06d11f984fe47b7ee0a3ed43532861cbae1dd0 --- A include/s1ap.hrl M src/sctp_client.erl M src/sctp_server.erl 3 files changed, 20 insertions(+), 10 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/include/s1ap.hrl b/include/s1ap.hrl new file mode 100644 index 0000000..479af3a --- /dev/null +++ b/include/s1ap.hrl @@ -0,0 +1,5 @@ +-define(S1AP_PORT, 36412). +-define(S1AP_SCTP_PPID, 18). +-define(S1AP_SCTP_STREAM, 0). + +%% vim:set ts=4 sw=4 et: diff --git a/src/sctp_client.erl b/src/sctp_client.erl index 67c7069..908afcd 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -9,9 +9,7 @@ -include_lib("kernel/include/inet.hrl"). -include_lib("kernel/include/inet_sctp.hrl"). --define(S1AP_PORT, 36412). --define(S1AP_PPID, 18). --define(SCTP_STREAM, 0). +-include("s1ap.hrl"). %% ------------------------------------------------------------------ %% public API @@ -31,8 +29,8 @@ send_data({Sock, Aid}, Data) -> - gen_sctp:send(Sock, #sctp_sndrcvinfo{stream = ?SCTP_STREAM, - ppid = ?S1AP_PPID, + gen_sctp:send(Sock, #sctp_sndrcvinfo{stream = ?S1AP_SCTP_STREAM, + ppid = ?S1AP_SCTP_PPID, assoc_id = Aid}, Data). diff --git a/src/sctp_server.erl b/src/sctp_server.erl index f032492..48583c5 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -13,9 +13,7 @@ -include_lib("kernel/include/inet.hrl"). -include_lib("kernel/include/inet_sctp.hrl"). --define(S1AP_PORT, 36412). --define(S1AP_PPID, 18). --define(SCTP_STREAM, 0). +-include("s1ap.hrl"). -record(server_state, {sock, clients}). -record(client_state, {addr_port, pid}). @@ -65,8 +63,8 @@ handle_cast({send_data, Aid, Data}, State) -> gen_sctp:send(State#server_state.sock, - #sctp_sndrcvinfo{stream = ?SCTP_STREAM, - ppid = ?S1AP_PPID, + #sctp_sndrcvinfo{stream = ?S1AP_SCTP_STREAM, + ppid = ?S1AP_SCTP_PPID, assoc_id = Aid}, Data), {noreply, State}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37083?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8f06d11f984fe47b7ee0a3ed43532861cbae1dd0 Gerrit-Change-Number: 37083 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in ...osmo-s1gw[master]: Decode S1AP PDUs and log them while forwarding

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37081?usp=email ) Change subject: Decode S1AP PDUs and log them while forwarding ...................................................................... Decode S1AP PDUs and log them while forwarding Change-Id: Iac1db3dbbf9b72fbd301b4c4133df3cb8c85cf89 --- A src/s1ap_proxy.erl M src/sctp_proxy.erl 2 files changed, 44 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl new file mode 100644 index 0000000..62701ef --- /dev/null +++ b/src/s1ap_proxy.erl @@ -0,0 +1,31 @@ +-module(s1ap_proxy). + +-export([handle_pdu/1]). + +%% ------------------------------------------------------------------ +%% public API +%% ------------------------------------------------------------------ + +%% Process an S1AP PDU +handle_pdu(Data) -> + case decode_pdu(Data) of + {ok, Pdu} -> + logger:info("S1AP PDU: ~p", [Pdu]), + Data; + {error, {asn1, Error}} -> + logger:error("S1AP PDU decoding failed: ~p", [Error]), + Data + end. + + +%% ------------------------------------------------------------------ +%% private API +%% ------------------------------------------------------------------ + +%% Decode an S1AP PDU +-spec decode_pdu(binary()) -> {ok, tuple()} | + {error, {asn1, tuple()}}. +decode_pdu(Data) -> + 'S1AP-PDU-Descriptions':decode('S1AP-PDU', Data). + +%% vim:set ts=4 sw=4 et: diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index e09720c..2cc6165 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -121,7 +121,8 @@ {[#sctp_sndrcvinfo{assoc_id = Aid}], Data}}, S) -> logger:info("MME connection (id=~p, ~p:~p) Rx ~p", [Aid, MmeAddr, MmePort, Data]), - sctp_server:send_data(maps:get(enb_aid, S), Data), + sctp_server:send_data(maps:get(enb_aid, S), + s1ap_proxy:handle_pdu(Data)), {keep_state, S}; %% Catch-all for other kinds of SCTP events @@ -160,7 +161,8 @@ %% Send a single message to the MME sctp_send(#{sock := Sock, mme_aid := Aid}, Data) -> - sctp_client:send_data({Sock, Aid}, Data). + sctp_client:send_data({Sock, Aid}, + s1ap_proxy:handle_pdu(Data)). %% Send pending messages to the MME -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37081?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iac1db3dbbf9b72fbd301b4c4133df3cb8c85cf89 Gerrit-Change-Number: 37081 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_server: allow passing bind address as string

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37082?usp=email ) Change subject: sctp_server: allow passing bind address as string ...................................................................... sctp_server: allow passing bind address as string Change-Id: I1557e4dd8c918ed70e93ff23dcf0e77c9c9e34a3 --- M src/sctp_server.erl 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 883991a..f032492 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -25,7 +25,7 @@ %% ------------------------------------------------------------------ start_link() -> - start_link({127,0,0,1}, ?S1AP_PORT). + start_link("127.0.0.1", ?S1AP_PORT). start_link(BindAddr, BindPort) -> gen_server:start_link({local, ?MODULE}, ?MODULE, @@ -40,6 +40,10 @@ %% gen_server API %% ------------------------------------------------------------------ +init([BindAddrStr, BindPort]) when is_list(BindAddrStr) -> + {ok, BindAddr} = inet:parse_address(BindAddrStr), + init([BindAddr, BindPort]); + init([BindAddr, BindPort]) -> process_flag(trap_exit, true), {ok, Sock} = gen_sctp:open([{ip, BindAddr}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I1557e4dd8c918ed70e93ff23dcf0e77c9c9e34a3 Gerrit-Change-Number: 37082 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: Add a global supervisor and env parameters

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37084?usp=email ) Change subject: Add a global supervisor and env parameters ...................................................................... Add a global supervisor and env parameters Change-Id: I2da6bccf728bdbe615aaf853b33077ceb4481176 --- M src/osmo_s1gw_app.erl A src/osmo_s1gw_sup.erl M src/sctp_proxy.erl M src/sctp_server.erl 4 files changed, 78 insertions(+), 19 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/osmo_s1gw_app.erl b/src/osmo_s1gw_app.erl index 596b3e8..7e1bc56 100644 --- a/src/osmo_s1gw_app.erl +++ b/src/osmo_s1gw_app.erl @@ -4,8 +4,9 @@ -export([start/2, stop/1]). start(_StartType, _StartArgs) -> - sctp_server:start_link(). - %% TODO: osmo_s1gw_sup:start_link(). + osmo_s1gw_sup:start_link(). stop(_State) -> - ok. + ok. + +%% vim:set ts=4 sw=4 et: diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl new file mode 100644 index 0000000..a62f266 --- /dev/null +++ b/src/osmo_s1gw_sup.erl @@ -0,0 +1,46 @@ +-module(osmo_s1gw_sup). +-behaviour(supervisor). + +-export([init/1, + start_link/0]). + +-include("s1ap.hrl"). + +-define(SERVER, ?MODULE). +-define(ENV_APP_NAME, osmo_s1gw). +-define(ENV_DEFAULT_S1GW_BIND_ADDR, "0.0.0.0"). +-define(ENV_DEFAULT_S1GW_BIND_PORT, ?S1AP_PORT). +-define(ENV_DEFAULT_MME_ADDR, "127.0.0.1"). +-define(ENV_DEFAULT_MME_PORT, ?S1AP_PORT). + +%% ------------------------------------------------------------------ +%% supervisor API +%% ------------------------------------------------------------------ + +start_link() -> + supervisor:start_link({local, ?SERVER}, ?MODULE, []). + + +init([]) -> + S1GWBindAddr = get_env(s1gw_bind_addr, ?ENV_DEFAULT_S1GW_BIND_ADDR), + S1GWBindPort = get_env(s1gw_bind_port, ?ENV_DEFAULT_S1GW_BIND_PORT), + MmeAddr = get_env(mme_addr, ?ENV_DEFAULT_MME_ADDR), + MmePort = get_env(mme_port, ?ENV_DEFAULT_MME_PORT), + SctpServer = {sctp_server, {sctp_server, start_link, + [S1GWBindAddr, S1GWBindPort, + {MmeAddr, MmePort}]}, + permanent, + 5000, + worker, + [sctp_server]}, + {ok, {{one_for_all, 5, 10}, [SctpServer]}}. + + +%% ------------------------------------------------------------------ +%% private API +%% ------------------------------------------------------------------ + +get_env(Param, Default) -> + application:get_env(?ENV_APP_NAME, Param, Default). + +%% vim:set ts=4 sw=4 et: diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 2cc6165..43cb081 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -34,6 +34,10 @@ %% gen_statem API %% ------------------------------------------------------------------ +init([Aid, MmeAddrStr, MmePort]) when is_list(MmeAddrStr) -> + {ok, MmeAddr} = inet:parse_address(MmeAddrStr), + init([Aid, MmeAddr, MmePort]); + init([Aid, MmeAddr, MmePort]) -> {ok, connecting, #{enb_aid => Aid, diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 48583c5..249cd8f 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -6,28 +6,25 @@ handle_call/3, handle_cast/2, terminate/2]). --export([start_link/0, - start_link/2]). --export([send_data/2]). +-export([start_link/3, + send_data/2]). -include_lib("kernel/include/inet.hrl"). -include_lib("kernel/include/inet_sctp.hrl"). -include("s1ap.hrl"). --record(server_state, {sock, clients}). +-record(server_state, {sock, clients, mme_addr_port}). -record(client_state, {addr_port, pid}). %% ------------------------------------------------------------------ %% public API %% ------------------------------------------------------------------ -start_link() -> - start_link("127.0.0.1", ?S1AP_PORT). - -start_link(BindAddr, BindPort) -> +start_link(BindAddr, BindPort, MmeAddrPort) -> gen_server:start_link({local, ?MODULE}, ?MODULE, - [BindAddr, BindPort], []). + [BindAddr, BindPort, MmeAddrPort], + []). send_data(Aid, Data) -> @@ -38,11 +35,11 @@ %% gen_server API %% ------------------------------------------------------------------ -init([BindAddrStr, BindPort]) when is_list(BindAddrStr) -> +init([BindAddrStr, BindPort, MmeAddrPort]) when is_list(BindAddrStr) -> {ok, BindAddr} = inet:parse_address(BindAddrStr), - init([BindAddr, BindPort]); + init([BindAddr, BindPort, MmeAddrPort]); -init([BindAddr, BindPort]) -> +init([BindAddr, BindPort, MmeAddrPort]) -> process_flag(trap_exit, true), {ok, Sock} = gen_sctp:open([{ip, BindAddr}, {port, BindPort}, @@ -52,7 +49,8 @@ logger:info("SCTP server listening on ~w:~w", [BindAddr, BindPort]), ok = gen_sctp:listen(Sock, true), {ok, #server_state{sock = Sock, - clients = dict:new()}}. + clients = dict:new(), + mme_addr_port = MmeAddrPort}}. handle_call(Info, _From, State) -> @@ -116,7 +114,8 @@ case ConnState of comm_up -> logger:notice("Connection (id=~p, ~p:~p) established", [Aid, FromAddr, FromPort]), - Clients = client_add(State#server_state.clients, Aid, FromAddr, FromPort); + Clients = client_add(State#server_state.clients, Aid, FromAddr, FromPort, + State#server_state.mme_addr_port); shutdown_comp -> logger:notice("Connection (id=~p, ~p:~p) closed", [Aid, FromAddr, FromPort]), Clients = client_del(State#server_state.clients, Aid); @@ -151,8 +150,8 @@ %% Add a new client to the list, spawning a proxy process -client_add(Clients, Aid, FromAddr, FromPort) -> - {ok, Pid} = sctp_proxy:start_link(Aid, {127,0,1,1}, ?S1AP_PORT), %% XXX! +client_add(Clients, Aid, FromAddr, FromPort, {MmeAddr, MmePort}) -> + {ok, Pid} = sctp_proxy:start_link(Aid, MmeAddr, MmePort), NewClient = #client_state{addr_port = {FromAddr, FromPort}, pid = Pid}, dict:store(Aid, NewClient, Clients). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I2da6bccf728bdbe615aaf853b33077ceb4481176 Gerrit-Change-Number: 37084 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024