#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;
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);
+
+/* { */
+/* 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);
char *cp = (char *)(ifam + 1);
int addrs = ifam->ifam_addrs;
int i;
+ int prefixlen = 0;
struct sockaddr *sa =NULL;
- struct sockaddr *addr =NULL;
- struct sockaddr *mask =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;
+
+ 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++)
{
if (!(addrs & 1<<i))
case AF_INET:
switch (1<<i) {
case RTA_NETMASK:
- mask = sa;
+ prefixlen = bitcount((unsigned int)((struct sockaddr_in *)sa)->sin_addr.s_addr);
break;
case RTA_IFA:
- addr = sa;
+ 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((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;
#endif
}
- if(addr)
+ if (!raddr_valid)
+ return;
+
+ if(rtm->rtm_type == RTM_NEWADDR)
{
- struct in_addr in = ((struct sockaddr_in *)addr)->sin_addr;
- printf("\nRTA_IFA %s\n", inet_ntoa(in));
+ 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;
}
- if(mask)
+ else
{
- struct in_addr in = ((struct sockaddr_in *)mask)->sin_addr;
- printf("\nRTA_NETMASK %s\n", inet_ntoa(in));
+ AvahiInterfaceAddress *addriface;
+ assert(rtm->rtm_type == RTM_DELADDR);
+ if (!(addriface = avahi_interface_monitor_get_address(m, iface, &raddr)))
+ return;
+ avahi_interface_address_free(addriface);
}
-
-
-/* if(rtm->rtm_type == RTM_NEWADDR) */
-/* { */
-/* AvahiInterfaceAddress *addr; */
-/* if (!(addr = avahi_interface_monitor_get_address(m, i, &raddr))) */
-/* if (!(addr = avahi_interface_address_new(m, i, &raddr, ifaddrmsg->ifa_prefixlen))) */
-/* return; /\* OOM *\/ */
-
-/* addr->global_scope = ifaddrmsg->ifa_scope == RT_SCOPE_UNIVERSE || ifaddrmsg->ifa_scope == RT_SCOPE_SITE; */
-/* } */
-/* else */
-/* { */
-/* AvahiInterfaceAddress *addr; */
-/* assert(rtm->rtm_type == RTM_DELADDR); */
-/* if (!(addr = avahi_interface_monitor_get_address(m, i, &raddr))) */
-/* return; */
-/* avahi_interface_address_free(addr); */
-/* } */
-/* avahi_interface_check_relevant(iface); */
-/* avahi_interface_update_rrs(iface, 0); */
+ avahi_interface_check_relevant(iface);
+ 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",
- rtm->rtm_version);
+ avahi_log_warn("routing message version %d not understood",
+ rtm->rtm_version);
return;
}
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) {
+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;
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", (int)bytes, ctime(&now));
- printf("parse_rtmsg\n");
- parse_rtmsg((struct rt_msghdr *)msg, bytes ,m);
+ parse_rtmsg((struct rt_msghdr *)msg, m);
}
while (bytes > 0);
}
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);
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);
}
void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) {
- assert(m);
+ size_t needed;
+ int mib[6];
+ char *buf, *lim, *next, count = 0;
+ struct rt_msghdr *rtm;
- wild_dump_interfaces(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.");
+ 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)
+ {
+ avahi_log_error("sysctl failed: %s", strerror(errno));
+ avahi_log_error("route-sysctl-estimate");
+ return;
+ }
+ if ((buf = avahi_malloc(needed)) == NULL)
+ {
+ 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;
+ }
+ }
+ lim = buf + needed;
+ for (next = buf; next < lim; next += rtm->rtm_msglen) {
+ rtm = (struct rt_msghdr *)next;
+ parse_rtmsg(rtm, 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.");
}
-
projects / catta / blobdiff