From e605929ab51c0aaaadab57bdab7da8c375403fb1 Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 14 Apr 2014 15:28:52 +0200 Subject: [PATCH] Updated schema. --- priv/mdns_server.schema | 18 +----------------- src/mdns_server_lib.app.src | 2 +- src/mdns_server_lib_app.erl | 10 ++++++++-- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/priv/mdns_server.schema b/priv/mdns_server.schema index dd74fb9..4ebb697 100644 --- a/priv/mdns_server.schema +++ b/priv/mdns_server.schema @@ -11,26 +11,10 @@ {datatype, string}]}. %% @doc The TCP endpoint that will be broadcasted. -{mapping, "mdns.server.endpoint", "mdns_server_lib.endpoint", +{mapping, "mdns.server.endpoint", "mdns_server_lib.listener", [{default, {"127.0.0.1", 4223}}, {datatype, ip}]}. -{translation, - "mdns_server_lib.ip", - fun(Conf) -> - {IP, _Port} = cuttlefish_util:conf_get_value("mdns.server.endpoint", Conf), - IP - end -}. - -{translation, - "mdns_server_lib.port", - fun(Conf) -> - {_IP, Port} = cuttlefish_util:conf_get_value("mdns.server.endpoint", Conf), - Port - end -}. - %% @doc The livetime of a broadcast, alsot he rebroadcast frequency {mapping, "mdns.server.ttl", "mdns_server_lib.ttl", [{default, 120}, diff --git a/src/mdns_server_lib.app.src b/src/mdns_server_lib.app.src index 8e22984..990c986 100644 --- a/src/mdns_server_lib.app.src +++ b/src/mdns_server_lib.app.src @@ -1,7 +1,7 @@ {application, mdns_server_lib, [ {description, ""}, - {vsn, "0.1.13"}, + {vsn, "0.1.14"}, {registered, []}, {applications, [ kernel, diff --git a/src/mdns_server_lib_app.erl b/src/mdns_server_lib_app.erl index c2fb6ec..eb446e0 100644 --- a/src/mdns_server_lib_app.erl +++ b/src/mdns_server_lib_app.erl @@ -12,8 +12,14 @@ start(_StartType, _StartArgs) -> {ok, Domain} = application:get_env(mdns_server_lib, domain), {ok, Service} = application:get_env(mdns_server_lib, service), - {ok, IP} = application:get_env(mdns_server_lib, ip), - {ok, Port} = application:get_env(mdns_server_lib, port), + {IP, Port} = case application:get_env(mdns_server_lib, listener) of + {ok, R} -> + R; + _ -> + {ok, IPx} = application:get_env(mdns_server_lib, ip), + {ok, Portx} = application:get_env(mdns_server_lib, port), + {IPx, Portx} + end, {ok, TTL} = application:get_env(mdns_server_lib, ttl), MDNSConfig0 = [{port, 5353}, {address, {224, 0, 0, 251}},