X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=f32cbd6db855ac832a58d1ab583f941ebbae88d6;hb=a3737cc61b48d7d435aadb573d3ef58e0849bf3d;hp=83272009a042463d8e8f9d8587ab17e340a5bf9c;hpb=e614891d38cae63957d0bfc00d34ecdbad4f8322;p=catta

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 8327200..f32cbd6 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -66,6 +66,7 @@
 #include "main.h"
 #include "simple-protocol.h"
 #include "static-services.h"
+#include "static-hosts.h"
 #include "ini-file-parser.h"
 
 #ifdef HAVE_DBUS
@@ -269,6 +270,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
             avahi_set_proc_title("%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s));
             
             static_service_add_to_server();
+            static_hosts_add_to_server();
             
             remove_dns_server_entry_groups();
             
@@ -285,6 +287,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
             char *n;
             
             static_service_remove_from_server();
+            static_hosts_remove_from_server();
             
             remove_dns_server_entry_groups();
             
@@ -484,6 +487,8 @@ static int load_config_file(DaemonConfig *c) {
                     c->server_config.use_ipv6 = is_yes(p->value);
                 else if (strcasecmp(p->key, "check-response-ttl") == 0)
                     c->server_config.check_response_ttl = is_yes(p->value);
+                else if (strcasecmp(p->key, "allow-point-to-point") == 0)
+                    c->server_config.allow_point_to_point = is_yes(p->value);
                 else if (strcasecmp(p->key, "use-iff-running") == 0)
                     c->server_config.use_iff_running = is_yes(p->value);
                 else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
@@ -670,10 +675,13 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC
             avahi_log_info("Got SIGHUP, reloading.");
 #ifdef ENABLE_CHROOT
             static_service_load(config.use_chroot);
+            static_hosts_load(config.use_chroot);
 #else
             static_service_load(0);
+            static_hosts_load(0);
 #endif            
             static_service_add_to_server();
+            static_service_remove_from_server();
 
             if (resolv_conf_entry_group)
                 avahi_s_entry_group_reset(resolv_conf_entry_group);
@@ -769,8 +777,10 @@ static int run_server(DaemonConfig *c) {
     load_resolv_conf();
 #ifdef ENABLE_CHROOT
     static_service_load(config.use_chroot);
+    static_hosts_load(config.use_chroot);
 #else
     static_service_load(0);
+    static_hosts_load(0);
 #endif
 
     if (!(avahi_server = avahi_server_new(poll_api, &c->server_config, server_callback, c, &error))) {
@@ -804,6 +814,10 @@ finish:
     
     static_service_remove_from_server();
     static_service_free_all();
+
+    static_hosts_remove_from_server();
+    static_hosts_free_all();
+
     remove_dns_server_entry_groups();
     
     simple_protocol_shutdown();