Osmocom Open Build Service

osmo-diameter2gsup_0.3.2.dsc -> osmo-diameter2gsup_0.3.3.dsc Changed

osmo-diameter2gsup_0.3.2.tar.xz/.tarball-version -> osmo-diameter2gsup_0.3.3.tar.xz/.tarball-version Changed

osmo-diameter2gsup_0.3.2.tar.xz/build_dep.tar.gz -> osmo-diameter2gsup_0.3.3.tar.xz/build_dep.tar.gz Changed

osmo-diameter2gsup_0.3.2.tar.xz/debian/changelog -> osmo-diameter2gsup_0.3.3.tar.xz/debian/changelog Changed

osmo-diameter2gsup_0.3.2.tar.xz/rebar.config -> osmo-diameter2gsup_0.3.3.tar.xz/rebar.config Changed

osmo-diameter2gsup_0.3.2.tar.xz/src/osmo_dia2gsup.erl -> osmo-diameter2gsup_0.3.3.tar.xz/src/osmo_dia2gsup.erl Changed

@@ -36,7 +36,7 @@
 -include_lib("diameter/include/diameter_gen_base_rfc6733.hrl").
 %-include_lib("diameter_settings.hrl").
 
--export(main/1).
+-export(get_env/2, main/1).
 
 % API
 -export(start_link/0).
@@ -47,6 +47,8 @@
 -export(code_change/3, terminate/2).
 
 -define(SERVER, ?MODULE).
+-define(ENV_DEFAULT_NODELAY, true).
+-define(ENV_DEFAULT_SCTP_BUFSZ, 65536).
 
 % Diameter application definitions
 
@@ -56,9 +58,9 @@
 -define(DIAMETER_DICT_HSS, diameter_3gpp_ts29_272).
 
 -define(APPID_S6, #'diameter_base_Vendor-Specific-Application-Id'{'Vendor-Id'=10415, 'Auth-Application-Id'=16777251}).
--define(SERVICE(Name), {'Origin-Host', application:get_env(osmo_dia2gsup, origin_host, "hss.localdomain")},
-			{'Origin-Realm', application:get_env(osmo_dia2gsup, origin_realm, "localdomain")},
-			{'Vendor-Id', application:get_env(osmo_dia2gsup, vendor_id, 0)},
+-define(SERVICE(Name), {'Origin-Host', get_env(origin_host, "hss.localdomain")},
+			{'Origin-Realm', get_env(origin_realm, "localdomain")},
+			{'Vendor-Id', get_env(vendor_id, 0)},
 			{'Origin-State-Id', diameter:origin_state_id()},
 			{'Product-Name', Name},
 			{'Auth-Application-Id', },
@@ -85,6 +87,9 @@
 stop() ->
 	gen_server:cast(?SERVER, stop).
 
+get_env(Param, Default) ->
+	application:get_env(?MODULE, Param, Default).
+
 main(_Args) ->
 	application:ensure_all_started(?MODULE),
 	timer:sleep(infinity).
@@ -98,13 +103,7 @@
 	% DIAMETER side
 	ProdName = atom_to_list(?MODULE),
 	ok = diameter:start_service(?SVC_NAME, ?SERVICE(ProdName)),
-
-	Ip = application:get_env(osmo_dia2gsup, diameter_ip, "127.0.0.8"),
-	Port = application:get_env(osmo_dia2gsup, diameter_port, 3868),
-	Proto = application:get_env(osmo_dia2gsup, diameter_proto, sctp),
-	ConnectTimer = application:get_env(osmo_dia2gsup, diameter_connect_timer, 30000),
-	listen(?SVC_NAME, {address, Proto, element(2,inet:parse_address(Ip)), Port}, {timer, ConnectTimer}),
-	lager:info("Diameter HSS Application started on IP ~s, ~p port ~p~n", Ip, Proto, Port),
+	listen(?SVC_NAME),
 	{ok, State}.
 
 %% @callback gen_server
@@ -144,12 +143,43 @@
 %% Internal Function Definitions
 %% ------------------------------------------------------------------
 
-listen(Name, {address, Protocol, IPAddr, Port}, {timer, ConnectTimer}) ->
-	TransOpts = {transport_module, tmod(Protocol)},
-		     {transport_config, {reuseaddr, true},
-					 {ip, IPAddr}, {port, Port}},
+listen(Name) ->
+	LAddr = get_env(diameter_ip, "127.0.0.8"),
+	LPort = get_env(diameter_port, 3868),
+	Proto = get_env(diameter_proto, sctp),
+	ConnectTimer = get_env(diameter_connect_timer, 30000),
+	TransOpts = {transport_module, tmod(Proto)},
+		     {transport_config, tcfg(Proto, LAddr, LPort)},
 		     {connect_timer, ConnectTimer},
-	{ok, _} = diameter:add_transport(Name, {listen, TransOpts}).
+	{ok, _} = diameter:add_transport(Name, {listen, TransOpts}),
+	lager:info("Diameter HSS Application started on IP ~s, ~p port ~p~n",
+		   LAddr, Proto, LPort).
 
 tmod(tcp) -> diameter_tcp;
 tmod(sctp) -> diameter_sctp.
+
+tcfg(tcp, LAddr, LPort) ->
+	Cfg = #{nodelay => get_env(diameter_nodelay, ?ENV_DEFAULT_NODELAY)},
+	tcfg(Cfg, LAddr, LPort);
+
+tcfg(sctp, LAddr, LPort) ->
+	Cfg = #{sctp_nodelay => get_env(diameter_nodelay, ?ENV_DEFAULT_NODELAY),
+	        recbuf => get_env(diameter_sctp_recbuf, ?ENV_DEFAULT_SCTP_BUFSZ),
+	        sndbuf => get_env(diameter_sctp_sndbuf, ?ENV_DEFAULT_SCTP_BUFSZ)},
+	tcfg(Cfg, LAddr, LPort);
+
+tcfg(Cfg, LAddr, LPort) when is_map(Cfg) ->
+	maps:to_list(Cfg#{ip => parse_addr(LAddr),
+			  port => LPort,
+			  reuseaddr => true}).
+
+parse_addr(any) -> any;
+parse_addr(localhost) -> localhost;
+
+parse_addr(AddrStr) when is_list(AddrStr) ->
+	{ok, Addr} = inet:parse_address(AddrStr),
+	Addr;
+
+parse_addr(Addr) ->
+	true = inet:is_ip_address(Addr),
+	Addr.

osmo-diameter2gsup_0.3.2.tar.xz/src/osmo_dia2gsup_sup.erl -> osmo-diameter2gsup_0.3.3.tar.xz/src/osmo_dia2gsup_sup.erl Changed

Changes of Revision 8