X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fiface-pfroute.c;h=cb47a0dba45f9f7351b05d867a82e28aac54839a;hb=5e6703337b90bccb1713ef9cb1aa5f029d75698f;hp=a7ecdc95c57e010f12c7640a4153176b92724aa5;hpb=8d83c6ca359d27f7c90ba874add798d064e58bc2;p=catta

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index a7ecdc9..cb47a0d 100644
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -92,12 +92,15 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
     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);
@@ -119,7 +122,7 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
   int prefixlen = 0;
   struct sockaddr *sa  =NULL;
 
-#ifdef __NetBSD__  
+#if defined(__NetBSD__) || defined(__OpenBSD__)
   if(((struct sockaddr *)cp)->sa_family == AF_UNSPEC)
     ((struct sockaddr *)cp)->sa_family = AF_INET;
 #endif
@@ -143,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));
@@ -155,7 +158,7 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
       case AF_INET6:
 	switch (1<<i) {
 	case RTA_NETMASK:
-	  prefixlen = bitcount(((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr);
+	  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));
@@ -200,7 +203,7 @@ 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);
@@ -224,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;
@@ -242,7 +245,7 @@ static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent event,void *user
 	avahi_log_error(__FILE__": recv() failed: %s", strerror(errno));
 	return;
       }
-      parse_rtmsg((struct rt_msghdr *)msg, bytes ,m);
+      parse_rtmsg((struct rt_msghdr *)msg, m);
     }
     while (bytes > 0);
 }
@@ -321,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;
@@ -334,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;