pespin has submitted this change. ( 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(-)

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve

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,