* added a missing include in dbus-protocol.c

 * added REUSEPORT in socket.c
 * cosmetic cleaning in iface-pfroute.c

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

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index f1a1d47a13e973faa74d5e2c84f35c5e1b983c07..f2401e9475c34fcdc4da6d36597de4ca421a83c4 100644 (file)
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -230,15 +230,12 @@ static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent event,void *user
     assert(fd == nl->fd);
 
     do {
-      time_t now = time(NULL);
       if((bytes = recv(nl->fd, msg, 2048, MSG_DONTWAIT)) < 0) {
        if (errno == EAGAIN || errno == EINTR)
          return;
        avahi_log_error(__FILE__": recv() failed: %s", strerror(errno));
        return;
       }
-
-      avahi_log_debug("socket_event: got message of size %d on %s", (int)bytes, ctime(&now));
       parse_rtmsg((struct rt_msghdr *)msg, bytes ,m);
     }
     while (bytes > 0);

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index ef7bca062d89d6b4927a90b361fabc36cf908f55..9be9ece24ab7d0a2b5d56be64f761a0f45cd926f 100644 (file)
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -171,6 +171,14 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) {
             return -1;
         }
 
+#ifdef SO_REUSEPORT
+        yes = 1;
+        if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) {
+            avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno));
+            return -1;
+        }
+#endif
+
         if (bind(fd, sa, l) < 0) {
             avahi_log_warn("bind() failed: %s", strerror(errno));
             return -1;

diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index 965ffd5e30fcfd6213297472da10e624a65aa658..d55becd5ba1740b0e256661a6c38b48a2e683426 100644 (file)
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -25,6 +25,7 @@
 
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <net/if.h>
 #include <errno.h>