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

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index e677fca..a7ecdc9 100644
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -25,31 +25,36 @@
 
 #include <avahi-common/malloc.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <err.h>
-#include <sysexits.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
-
+#include <sys/param.h>
 #include <sys/sysctl.h>
+
 #include <net/route.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <net/if_dl.h>
-
-#include <arpa/inet.h>
-
+#include <netinet/in.h>
 
 #include "log.h"
 #include "iface.h"
 #include "iface-pfroute.h"
 #include "util.h"
 
+static int bitcount (unsigned int n)  
+{  
+  int count=0 ;
+  while (n)
+    {
+      count++ ;
+      n &= (n - 1) ;
+    }
+  return count ;
+}
+
 static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
 {
   AvahiHwInterface *hw;
@@ -83,16 +88,16 @@ 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);
   
-  printf("======\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);
+  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);
   
   avahi_hw_interface_check_relevant(hw);
   avahi_hw_interface_update_rrs(hw, 0);
@@ -111,38 +116,88 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
   char *cp = (char *)(ifam + 1);
   int addrs = ifam->ifam_addrs;
   int i;
+  int prefixlen = 0;
+  struct sockaddr *sa  =NULL;
+
+#ifdef __NetBSD__  
+  if(((struct sockaddr *)cp)->sa_family == AF_UNSPEC)
+    ((struct sockaddr *)cp)->sa_family = AF_INET;
+#endif
 
-  if(addrs == 0)
+  if(((struct sockaddr *)cp)->sa_family != AF_INET && ((struct sockaddr *)cp)->sa_family != AF_INET6)
     return;
 
-  for(i = 1; i; i <<=1)
+  if (!(iface = avahi_interface_monitor_get_interface(m, (AvahiIfIndex) ifam->ifam_index, avahi_af_to_proto(((struct sockaddr *)cp)->sa_family))))
+    return;
+
+  raddr.proto = avahi_af_to_proto(((struct sockaddr *)cp)->sa_family);
+  
+  for(i = 0; addrs != 0 && i < RTAX_MAX; addrs &= ~(1<<i), i++)
     {
-      struct sockaddr *sa;
+      if (!(addrs & 1<<i))
+	continue;
       sa = (struct sockaddr *)cp;
-
-      /* interface addr sockaddr present */
-      if (i & addrs && i & RTA_BRD)
-	{
-	  if(sa->sa_family == AF_INET)
-	    {
-	      struct in_addr in = ((struct sockaddr_in *)sa)->sin_addr;
-	      printf("\n%s\n",
-		     inet_ntoa(in)); 
-	    }
-	  else
-	    if(sa->sa_family == AF_INET6)
-	      {
-		/* 	    struct sockaddr_in6 sin6; */
-		
-	      }
+      if (sa->sa_len == 0) 
+	continue;
+      switch(sa->sa_family) {
+      case AF_INET:
+	switch (1<<i) {
+	case RTA_NETMASK:
+	  prefixlen = bitcount(((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));
+	  raddr_valid = 1;
+	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;
+      }
 #ifdef SA_SIZE
-	  cp += SA_SIZE(sa);
+      cp += SA_SIZE(sa);
 #else
-	  ADVANCE(cp, sa);
+      ADVANCE(cp, sa);
 #endif
+    }
 
-	}
+  if (!raddr_valid)
+    return;
+
+  if(rtm->rtm_type == RTM_NEWADDR)
+    {
+      AvahiInterfaceAddress *addriface;
+      if (!(addriface = avahi_interface_monitor_get_address(m, iface, &raddr)))
+	if (!(addriface = avahi_interface_address_new(m, iface, &raddr, prefixlen)))
+	  return; /* OOM */
+      /*       FIXME */
+      /*       addriface->global_scope = ifaddrmsg->ifa_scope == RT_SCOPE_UNIVERSE || ifaddrmsg->ifa_scope == RT_SCOPE_SITE; */
+      addriface->global_scope = 1;
+    }
+  else
+    {
+      AvahiInterfaceAddress *addriface;
+      assert(rtm->rtm_type == RTM_DELADDR);
+      if (!(addriface = avahi_interface_monitor_get_address(m, iface, &raddr)))
+	return;
+      avahi_interface_address_free(addriface);
     }
+  
+  avahi_interface_check_relevant(iface);
+  avahi_interface_update_rrs(iface, 0);
 }
 
 static void parse_rtmsg(struct rt_msghdr *rtm, int msglen, AvahiInterfaceMonitor *m)
@@ -151,8 +206,8 @@ static void parse_rtmsg(struct rt_msghdr *rtm, int msglen, AvahiInterfaceMonitor
   assert(rtm);
   
   if (rtm->rtm_version != RTM_VERSION) {
-    avahi_log_warn("routing message version %d not understood\n",
-		      rtm->rtm_version);
+    avahi_log_warn("routing message version %d not understood",
+		   rtm->rtm_version);
     return;
   }
 
@@ -164,48 +219,11 @@ static void parse_rtmsg(struct rt_msghdr *rtm, int msglen, AvahiInterfaceMonitor
   case RTM_DELADDR:
     rtm_addr(rtm,m);
     break;
-    
   default:
     break;
   }
 }
 
-
-static int wild_dump_interfaces(AvahiInterfaceMonitor *m)
-{
-  size_t needed;
-  int mib[6];
-  char *buf, *lim, *next, count = 0;
-  struct rt_msghdr *rtm;
-
- retry2:
-  mib[0] = CTL_NET;
-  mib[1] = PF_ROUTE;
-  mib[2] = 0;             /* protocol */
-  mib[3] = 0;             /* wildcard address family */
-  mib[4] = NET_RT_IFLIST;
-  mib[5] = 0;             /* no flags */
-  if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-    err(EX_OSERR, "route-sysctl-estimate");
-  if ((buf = malloc(needed)) == NULL)
-    errx(EX_OSERR, "malloc failed");
-  if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-    if (errno == ENOMEM && count++ < 10) {
-      warnx("Routing table grew, retrying");
-      sleep(1);
-      free(buf);
-      goto retry2;
-    }
-    err(EX_OSERR, "actual retrieval of interface table");
-  }
-  lim = buf + needed;
-  for (next = buf; next < lim; next += rtm->rtm_msglen) {
-    rtm = (struct rt_msghdr *)next;
-    parse_rtmsg(rtm, rtm->rtm_msglen, m);
-  }
-  return 0;
-}
-
 static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent event,void *userdata) {
   AvahiInterfaceMonitor *m = (AvahiInterfaceMonitor *)userdata;
   AvahiPfRoute *nl = m->osdep.pfroute;
@@ -218,16 +236,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;
       }
-
-      (void) printf("\ngot message of size %d on %s", bytes, ctime(&now));
-      printf("parse_rtmsg\n");
       parse_rtmsg((struct rt_msghdr *)msg, bytes ,m);
     }
     while (bytes > 0);
@@ -259,14 +273,13 @@ int avahi_interface_monitor_init_osdep(AvahiInterfaceMonitor *m) {
       goto fail;
     }
     
-    printf("avahi_interface_monitor_init_osdep\n");
     return 0;
 
 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);
@@ -282,19 +295,50 @@ 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);
-      
+
+      avahi_free(m->osdep.pfroute);
       m->osdep.pfroute = NULL;
     }
 }
 
 void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) {
-    assert(m);
-
-    wild_dump_interfaces(m);
+  size_t needed;
+  int mib[6];
+  char *buf, *lim, *next, count = 0;
+  struct rt_msghdr *rtm;
 
+  assert(m);
+  
+ retry2:
+  mib[0] = CTL_NET;
+  mib[1] = PF_ROUTE;
+  mib[2] = 0;             /* protocol */
+  mib[3] = 0;             /* wildcard address family */
+  mib[4] = NET_RT_IFLIST;
+  mib[5] = 0;             /* no flags */
+  if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+    return;
+  if ((buf = avahi_malloc(needed)) == NULL)
+    return;
+  if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+    if (errno == ENOMEM && count++ < 10) {
+      sleep(1);
+      avahi_free(buf);
+      goto retry2;
+    }
+  }
+  lim = buf + needed;
+  for (next = buf; next < lim; next += rtm->rtm_msglen) {
+    rtm = (struct rt_msghdr *)next;
+    parse_rtmsg(rtm, rtm->rtm_msglen, m);
+  }
+  
+  m->list_complete = 1;
+  avahi_interface_monitor_check_relevant(m);
+  avahi_interface_monitor_update_rrs(m, 0);
+  avahi_log_info("Network interface enumeration completed.");
 }
-