bump soname

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

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index e05b2262ab2c9089d7aead8defb2e20c247932c5..cb47a0dba45f9f7351b05d867a82e28aac54839a 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,16 +88,19 @@ 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);
-  
-  avahi_log_debug("======\n name: %s\n index:%d\n mtu:%d\n mac:%s\n flags_ok:%d\n======", 
-                 hw->name, hw->index, 
-                 hw->mtu, 
-                 avahi_format_mac_address(hw->mac_address, hw->mac_address_size),
-                 hw->flags_ok);
+ 
+/*   { */
+/*     char mac[256]; */
+/*     avahi_log_debug("======\n name: %s\n index:%d\n mtu:%d\n mac:%s\n flags_ok:%d\n======",  */
+/*                 hw->name, hw->index,  */
+/*                 hw->mtu,  */
+/*                 avahi_format_mac_address(mac, sizeof(mac), hw->mac_address, hw->mac_address_size), */
+/*                 hw->flags_ok); */
+/*   } */
   
   avahi_hw_interface_check_relevant(hw);
   avahi_hw_interface_update_rrs(hw, 0);
@@ -118,6 +122,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;
 
@@ -137,7 +146,7 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
       case AF_INET:
        switch (1<<i) {
        case RTA_NETMASK:
-         prefixlen = bitcount(((struct sockaddr_in *)sa)->sin_addr.s_addr);
+         prefixlen = bitcount((unsigned int)((struct sockaddr_in *)sa)->sin_addr.s_addr);
          break;
        case RTA_IFA:
          memcpy(raddr.data.data, &((struct sockaddr_in *)sa)->sin_addr,  sizeof(struct in_addr));
@@ -145,7 +154,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((unsigned int)((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;
@@ -183,13 +203,13 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
   avahi_interface_update_rrs(iface, 0);
 }
 
-static void parse_rtmsg(struct rt_msghdr *rtm, int msglen, AvahiInterfaceMonitor *m)
+static void parse_rtmsg(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
 {
   assert(m);
   assert(rtm);
   
   if (rtm->rtm_version != RTM_VERSION) {
-    avahi_log_warn("routing message version %d not understood\n",
+    avahi_log_warn("routing message version %d not understood",
                   rtm->rtm_version);
     return;
   }
@@ -207,7 +227,7 @@ static void parse_rtmsg(struct rt_msghdr *rtm, int msglen, AvahiInterfaceMonitor
   }
 }
 
-static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent event,void *userdata) {
+static void socket_event(AvahiWatch *w, int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event,void *userdata) {
   AvahiInterfaceMonitor *m = (AvahiInterfaceMonitor *)userdata;
   AvahiPfRoute *nl = m->osdep.pfroute;
     ssize_t bytes;
@@ -219,16 +239,13 @@ 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("\ngot message of size %d on %s", (int)bytes, ctime(&now));
-      parse_rtmsg((struct rt_msghdr *)msg, bytes ,m);
+      parse_rtmsg((struct rt_msghdr *)msg, m);
     }
     while (bytes > 0);
 }
@@ -265,7 +282,7 @@ fail:
 
     if (m->osdep.pfroute) {
       if (m->osdep.pfroute->watch)
-        m->osdep.pfroute->poll_api->watch_free(m->osdep.pfroute->watch);
+        m->server->poll_api->watch_free(m->osdep.pfroute->watch);
       
       if (fd >= 0)
         close(fd);
@@ -281,7 +298,7 @@ void avahi_interface_monitor_free_osdep(AvahiInterfaceMonitor *m) {
 
     if (m->osdep.pfroute) {
       if (m->osdep.pfroute->watch)
-        m->osdep.pfroute->poll_api->watch_free(m->osdep.pfroute->watch);
+        m->server->poll_api->watch_free(m->osdep.pfroute->watch);
       
       if (m->osdep.pfroute->fd >= 0)
         close(m->osdep.pfroute->fd);
@@ -307,11 +324,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;
@@ -320,7 +346,7 @@ void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) {
   lim = buf + needed;
   for (next = buf; next < lim; next += rtm->rtm_msglen) {
     rtm = (struct rt_msghdr *)next;
-    parse_rtmsg(rtm, rtm->rtm_msglen, m);
+    parse_rtmsg(rtm, m);
   }
   
   m->list_complete = 1;