laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37800?usp=email ) Change subject: config: rename upf_{loc,rem}_addr to pfcp_{loc,rem}_addr ...................................................................... config: rename upf_{loc,rem}_addr to pfcp_{loc,rem}_addr Clarify that the existing parameters are related to PFCP. Change-Id: I8447bac3a0a61537f9327121f28266a8e5af7f9c --- M config/sys.config M src/osmo_s1gw_sup.erl 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/config/sys.config b/config/sys.config index 99930cc..993176b 100644 --- a/config/sys.config +++ b/config/sys.config @@ -14,8 +14,8 @@ [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB 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 - {upf_loc_addr, "127.0.1.1"}, %% local address for outgoing connections to the UPF - {upf_rem_addr, "127.0.1.2"} %% remote address for outgoing connections to the UPF + {pfcp_loc_addr, "127.0.1.1"}, %% local address for incoming PFCP PDUs from UPF + {pfcp_rem_addr, "127.0.1.2"} %% remote address for outgoing PFCP PDUs to UPF ]}, %% ================================================================================ %% kernel config diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 7bfd53f..c6adb55 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -47,8 +47,8 @@ -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). --define(ENV_DEFAULT_UPF_LOC_ADDR, "127.0.1.1"). --define(ENV_DEFAULT_UPF_REM_ADDR, "127.0.1.2"). +-define(ENV_DEFAULT_PFCP_LOC_ADDR, "127.0.1.1"). +-define(ENV_DEFAULT_PFCP_REM_ADDR, "127.0.1.2"). %% ------------------------------------------------------------------ %% supervisor API @@ -64,8 +64,8 @@ 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), - UpfLocAddr = get_env(upf_loc_addr, ?ENV_DEFAULT_UPF_LOC_ADDR), - UpfRemAddr = get_env(upf_rem_addr, ?ENV_DEFAULT_UPF_REM_ADDR), + PfcpLocAddr = get_env(pfcp_loc_addr, ?ENV_DEFAULT_PFCP_LOC_ADDR), + PfcpRemAddr = get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), SctpServer = {sctp_server, {sctp_server, start_link, [S1GWBindAddr, S1GWBindPort, @@ -75,7 +75,7 @@ worker, [sctp_server]}, PfcpPeer = {pfcp_peer, {pfcp_peer, start_link, - [UpfLocAddr, UpfRemAddr]}, + [PfcpLocAddr, PfcpRemAddr]}, permanent, 5000, worker, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37800?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8447bac3a0a61537f9327121f28266a8e5af7f9c Gerrit-Change-Number: 37800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>