* preliminary ipv6 support for BSD

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

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index 56149dae83ee7ff2e0f96bd4c0494278fa95f0f7..f1a1d47a13e973faa74d5e2c84f35c5e1b983c07 100644 (file)
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -145,7 +145,18 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
        default:
          break;
        }
+       break;
       case AF_INET6:
+       switch (1<<i) {
+       case RTA_NETMASK:
+         prefixlen = bitcount(((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr);
+         break;
+       case RTA_IFA:
+         memcpy(raddr.data.data, &((struct sockaddr_in6 *)sa)->sin6_addr,  sizeof(struct in6_addr));
+         raddr_valid = 1;
+       default:
+         break;
+       }
        break;
       default:
        break;

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index 497f06196acd36bd68b947351cd4e552d3f6d948..a91a7403ee1aec1b2844b5ca9a6e864b22e75489 100644 (file)
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -403,17 +403,39 @@ int avahi_open_socket_ipv6(int no_reuse) {
     if (r < 0)
         goto fail;
 
+#ifdef IPV6_RECVHOPS
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno));
+        goto fail;
+    }
+#elif IPV6_RECVHOPLIMIT
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno));
+        goto fail;
+    }
+#elif IPV6_HOPLIMIT
     yes = 1;
     if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
         goto fail;
     }
+#endif
 
+#ifdef IPV6_RECVPKTINFO
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno));
+        goto fail;
+    }
+#elif IPV6_PKTINFO
     yes = 1;
     if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno));
         goto fail;
     }
+#endif
     
     if (avahi_set_cloexec(fd) < 0) {
         avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno));
@@ -679,7 +701,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in *ret_sa, A
            break;
 #endif
          default:
-           avahi_log_warn("Unhandled cmsg_type : %d\n",cmsg->cmsg_type);
+           avahi_log_warn("Unhandled cmsg_type : %d",cmsg->cmsg_type);
            break;
          }
         }
@@ -843,17 +865,39 @@ int avahi_open_unicast_socket_ipv6(void) {
         goto fail;
     }
 
+#ifdef IPV6_RECVHOPS
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno));
+        goto fail;
+    }
+#elif IPV6_RECVHOPLIMIT
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno));
+        goto fail;
+    }
+#elif IPV6_HOPLIMIT
     yes = 1;
     if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
         goto fail;
     }
+#endif
 
+#ifdef IPV6_RECVPKTINFO
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno));
+        goto fail;
+    }
+#elif IPV6_PKTINFO
     yes = 1;
     if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno));
         goto fail;
     }
+#endif
     
     if (avahi_set_cloexec(fd) < 0) {
         avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno));