* add an option to make avahi-daemon using POINTOPOINT interfaces (disable by default)

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1146 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-core/core.h b/avahi-core/core.h
index 62eeef6a0c9359e6ab2acb06a1b8a408363ca259..d1c60ccd4e7f9d471d325d6707d03bb04f129188 100644 (file)
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -62,6 +62,7 @@ typedef struct AvahiServerConfig {
     int disallow_other_stacks;        /**< Make sure that only one mDNS responder is run at the same time on the local machine. If this is enable Avahi will not set SO_REUSADDR on its sockets, effectively preventing other stacks from running on the local machine */
     AvahiStringList *browse_domains;  /**< Additional browsing domains */
     int disable_publishing;           /**< Disable publishing of any record */
+    int allow_point_to_point;         /**< Enable publishing on POINTOPOINT interfaces */
 } AvahiServerConfig;
 
 /** Allocate a new mDNS responder object. */

diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
index 985fe3f9ef1413f37e451ab69f6a4bd234eaf018..910000da214be039871a9b85416d5f626da18ae7 100644 (file)
--- a/avahi-core/iface-linux.c
+++ b/avahi-core/iface-linux.c
@@ -98,7 +98,7 @@ static void netlink_callback(AvahiNetlink *nl, struct nlmsghdr *n, void* userdat
             (!m->server->config.use_iff_running || (ifinfomsg->ifi_flags & IFF_RUNNING)) &&
             !(ifinfomsg->ifi_flags & IFF_LOOPBACK) &&
             (ifinfomsg->ifi_flags & IFF_MULTICAST) &&
-            !(ifinfomsg->ifi_flags & IFF_POINTOPOINT);
+            (m->server->config.allow_point_to_point || !(ifinfomsg->ifi_flags & IFF_POINTOPOINT));
 
         /* Handle interface attributes */
         l = NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg));

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index cb47a0dba45f9f7351b05d867a82e28aac54839a..6fb6cfc6cd7af4b92d1a9df4301c184b4eda8367 100644 (file)
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -80,7 +80,7 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
     (!m->server->config.use_iff_running || (ifm->ifm_flags & IFF_RUNNING)) &&
     !(ifm->ifm_flags & IFF_LOOPBACK) &&
     (ifm->ifm_flags & IFF_MULTICAST) &&
-    !(ifm->ifm_flags & IFF_POINTOPOINT);
+    (m->server->config.allow_point_to_point || !(ifinfomsg->ifi_flags & IFF_POINTOPOINT));
   
   avahi_free(hw->name);
   hw->name = avahi_strndup(sdl->sdl_data, sdl->sdl_nlen);

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 017605efec2428aed34a2eddfe0fe29030521383..4aa48a8467ae84c3583e34c5836dc0474cb10fc2 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -1538,6 +1538,7 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) {
     c->disallow_other_stacks = 0;
     c->browse_domains = NULL;
     c->disable_publishing = 0;
+    c->allow_point_to_point = 0;
     
     return c;
 }

diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index c99574faf0511b1234deb59165255a9a3e5beeca..d694d7bd3a1013eb1347b510984dc206da5716fa 100644 (file)
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -30,6 +30,7 @@ use-ipv6=no
 #use-iff-running=no
 #enable-dbus=yes
 #disallow-other-stacks=no
+#allow-point-to-point=no
 
 [wide-area]
 enable-wide-area=yes

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 43ad74d1ccd75b85d9856f2b97da9b190f9ac806..f32cbd6db855ac832a58d1ab583f941ebbae88d6 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -487,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)

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index cce8229405159fbe3d24fefca458e5f4e8dd514c..86df421234ebbc861185950edbfec2290e4983bd 100644 (file)
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -116,6 +116,13 @@
         people this option defaults to "no".</p>
       </option>
 
+      <option>
+        <p><opt>allow-point-to-point=</opt> Takes a boolean value
+        ("yes" or "no"). If set to "yes", avahi-daemon will accept
+       interfaces with the POINTOPOINT flag. This option defaults
+       to "no" as it may be unreliable.</p>
+      </option>
+
        </section>
 
        <section name="Section [wide-area]">