update TODO, only 3 items on the TODO left

[catta] / avahi-core / iface-pfroute.c

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index f2401e9475c34fcdc4da6d36597de4ca421a83c4..6d7de60c9869785d86b256c38af798d6bc2bd5e2 100644 (file)
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -31,6 +31,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 
 #include <net/route.h>
@@ -87,8 +88,8 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
   hw->mtu = ifm->ifm_data.ifi_mtu;
   
   hw->mac_address_size = sdl->sdl_alen;
-  if (hw->mac_address_size > AVAHI_MAX_MAC_ADDRESS)
-    hw->mac_address_size = AVAHI_MAX_MAC_ADDRESS;
+  if (hw->mac_address_size > AVAHI_MAC_ADDRESS_MAX)
+    hw->mac_address_size = AVAHI_MAC_ADDRESS_MAX;
   
   memcpy(hw->mac_address, sdl->sdl_data + sdl->sdl_nlen, hw->mac_address_size);
   
@@ -118,6 +119,11 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
   int prefixlen = 0;
   struct sockaddr *sa  =NULL;
 
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+  if(((struct sockaddr *)cp)->sa_family == AF_UNSPEC)
+    ((struct sockaddr *)cp)->sa_family = AF_INET;
+#endif
+
   if(((struct sockaddr *)cp)->sa_family != AF_INET && ((struct sockaddr *)cp)->sa_family != AF_INET6)
     return;
 
@@ -315,11 +321,20 @@ void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) {
   mib[4] = NET_RT_IFLIST;
   mib[5] = 0;             /* no flags */
   if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-    return;
+    {
+      avahi_log_error("sysctl failed: %s", strerror(errno));
+      avahi_log_error("route-sysctl-estimate");
+      return;
+    }
   if ((buf = avahi_malloc(needed)) == NULL)
-    return;
+    {
+      avahi_log_error("malloc failed in avahi_interface_monitor_sync");
+      return;
+    }
   if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+    avahi_log_warn("sysctl failed: %s", strerror(errno));
     if (errno == ENOMEM && count++ < 10) {
+      avahi_log_warn("Routing table grew, retrying");
       sleep(1);
       avahi_free(buf);
       goto retry2;