erlang/osmo-epdg
6
0
Fork 0
mirror of https://gerrit.osmocom.org/erlang/osmo-epdg synced 2024-08-12 14:06:20 +00:00
Code Issues Releases Wiki Activity

swx: Rename diameter related parameters

Browse source 
This allows easily identifying and differntiating the config parameters
from other diameter interfaces present such as s6b.

Change-Id: I63fe4c7acc7460575a921b254adf066134c0527f
This commit is contained in:
Pau Espin 2024-01-16 19:46:18 +01:00
parent 978159d58e
commit 1bda89c5cf
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
config/sys.config
View file

@ -6,18 +6,18 @@
{gsup_local_ip, "0.0.0.0"}, {gsup_local_ip, "0.0.0.0"},
{gsup_local_port, 4222}, {gsup_local_port, 4222},
% Diameter SWx Connection parameters % Diameter SWx Connection parameters
{diameter_remote_ip, "127.0.0.1"}, {dia_swx_remote_ip, "127.0.0.1"},
{diameter_remote_port, 3868}, {dia_swx_remote_port, 3868},
{diameter_proto, sctp}, {dia_swx_proto, sctp},
{diameter_connect_timer, 30000}, {dia_swx_connect_timer, 30000},
{diameter_watchdog_timer, 30000}, {dia_swx_watchdog_timer, 30000},
{diameter_watchdog_config, {dia_swx_watchdog_config,
[{okay, 3}, [{okay, 3},
{suspect, 1}]}, {suspect, 1}]},
{vendor_id, 0}, {dia_swx_vendor_id, 0},
{origin_host, "epdg.localdomain"}, {dia_swx_origin_host, "epdg.localdomain"},
{origin_realm, "localdomain"}, {dia_swx_origin_realm, "localdomain"},
{context_id, "epdg@localdomain"}, {dia_swx_context_id, "epdg@localdomain"},
% Diameter s6b Connection parameters % Diameter s6b Connection parameters
{dia_s6b_local_ip, "127.0.0.10"}, {dia_s6b_local_ip, "127.0.0.10"},
{dia_s6b_local_port, 3868}, {dia_s6b_local_port, 3868},

18
src/epdg_diameter_swx.erl
View file

@ -79,9 +79,9 @@
%% supporting multiple Diameter applications may or may not want to %% supporting multiple Diameter applications may or may not want to
%% configure a common callback module on all applications. %% configure a common callback module on all applications.
-define(SERVICE, -define(SERVICE,
[{'Origin-Host', application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)}, [{'Origin-Host', application:get_env(?ENV_APP_NAME, dia_swx_origin_host, ?ENV_DEFAULT_ORIG_HOST)},
{'Origin-Realm', application:get_env(?ENV_APP_NAME, origin_realm, ?ENV_DEFAULT_ORIG_REALM)}, {'Origin-Realm', application:get_env(?ENV_APP_NAME, dia_swx_origin_realm, ?ENV_DEFAULT_ORIG_REALM)},
{'Vendor-Id', application:get_env(?ENV_APP_NAME, vendor_id, ?ENV_DEFAULT_VENDOR_ID)}, {'Vendor-Id', application:get_env(?ENV_APP_NAME, dia_swx_vendor_id, ?ENV_DEFAULT_VENDOR_ID)},
{'Vendor-Specific-Application-Id', {'Vendor-Specific-Application-Id',
[#'diameter_base_Vendor-Specific-Application-Id'{ [#'diameter_base_Vendor-Specific-Application-Id'{
'Vendor-Id' = ?VENDOR_ID_3GPP, 'Vendor-Id' = ?VENDOR_ID_3GPP,
@ -121,12 +121,12 @@ peer_down(API, SvcName, {PeerRef, _} = Peer) ->
ok. ok.
init(State) -> init(State) ->
Proto = application:get_env(?ENV_APP_NAME, diameter_proto, ?ENV_DEFAULT_DIAMETER_PROTO), Proto = application:get_env(?ENV_APP_NAME, dia_swx_proto, ?ENV_DEFAULT_DIAMETER_PROTO),
Ip = application:get_env(?ENV_APP_NAME, diameter_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), Ip = application:get_env(?ENV_APP_NAME, dia_swx_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP),
Port = application:get_env(?ENV_APP_NAME, diameter_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), Port = application:get_env(?ENV_APP_NAME, dia_swx_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT),
ConnectTimer = application:get_env(?ENV_APP_NAME, diameter_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS), ConnectTimer = application:get_env(?ENV_APP_NAME, dia_swx_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS),
WatchdogTimer = application:get_env(?ENV_APP_NAME, diameter_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS), WatchdogTimer = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS),
WatchdogConfig = application:get_env(?ENV_APP_NAME, diameter_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG), WatchdogConfig = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG),
ok = diameter:start_service(?MODULE, ?SERVICE), ok = diameter:start_service(?MODULE, ?SERVICE),
% lager:info("DiaServices is ~p~n", [DiaServ]), % lager:info("DiaServices is ~p~n", [DiaServ]),
{ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}),