X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fiface-pfroute.c;h=9a2e953398e6d03dacaae7bd515937dbd44f9063;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=4822d5979e15d12ef6198182d91a8805d51d6d1e;hpb=3073103812f0ea376582eb0ff1479945a847b361;p=catta diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c index 4822d59..9a2e953 100644 --- a/avahi-core/iface-pfroute.c +++ b/avahi-core/iface-pfroute.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -31,7 +29,12 @@ #include #include +#include +#ifdef HAVE_SYS_SYSCTL_H #include +#else +#include +#endif #include #include @@ -43,8 +46,8 @@ #include "iface-pfroute.h" #include "util.h" -static int bitcount (unsigned int n) -{ +static int bitcount (unsigned int n) +{ int count=0 ; while (n) { @@ -59,52 +62,59 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) AvahiHwInterface *hw; struct if_msghdr *ifm = (struct if_msghdr *)rtm; struct sockaddr_dl *sdl = (struct sockaddr_dl *)(ifm + 1); - + if (sdl->sdl_family != AF_LINK) return; - + if (ifm->ifm_addrs == 0 && ifm->ifm_index > 0) { if (!(hw = avahi_interface_monitor_get_hw_interface(m, (AvahiIfIndex) ifm->ifm_index))) return; avahi_hw_interface_free(hw, 0); return; } - + if (!(hw = avahi_interface_monitor_get_hw_interface(m, ifm->ifm_index))) if (!(hw = avahi_hw_interface_new(m, (AvahiIfIndex) ifm->ifm_index))) return; /* OOM */ - + hw->flags_ok = (ifm->ifm_flags & IFF_UP) && (!m->server->config.use_iff_running || (ifm->ifm_flags & IFF_RUNNING)) && !(ifm->ifm_flags & IFF_LOOPBACK) && (ifm->ifm_flags & IFF_MULTICAST) && - !(ifm->ifm_flags & IFF_POINTOPOINT); - + (m->server->config.allow_point_to_point || !(ifm->ifm_flags & IFF_POINTOPOINT)); + avahi_free(hw->name); hw->name = avahi_strndup(sdl->sdl_data, sdl->sdl_nlen); - + hw->mtu = ifm->ifm_data.ifi_mtu; - + hw->mac_address_size = sdl->sdl_alen; 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); } #define ROUNDUP(a) \ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#ifdef HAVE_SYS_SYSCTL_H #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) +#else +#define ADVANCE(x, n) (x += ROUNDUP(sizeof(struct sockaddr))) +#endif static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) { @@ -113,31 +123,51 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) int raddr_valid = 0; struct ifa_msghdr *ifam = (struct ifa_msghdr *) rtm; char *cp = (char *)(ifam + 1); - int addrs = ifam->ifam_addrs; + char *cp0; int i; int prefixlen = 0; struct sockaddr *sa =NULL; - if(((struct sockaddr *)cp)->sa_family != AF_INET && ((struct sockaddr *)cp)->sa_family != AF_INET6) +#if defined(__NetBSD__) || defined(__OpenBSD__) + if(((struct sockaddr *)cp)->sa_family == AF_UNSPEC) + ((struct sockaddr *)cp)->sa_family = AF_INET; +#endif + + for (cp0 = cp, i = 0; i < RTAX_MAX; i++) { + if (!(ifam->ifam_addrs & (1<sa_family != AF_INET && sa->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)))) + if (!(iface = avahi_interface_monitor_get_interface(m, (AvahiIfIndex) ifam->ifam_index, avahi_af_to_proto(sa->sa_family)))) return; - raddr.proto = avahi_af_to_proto(((struct sockaddr *)cp)->sa_family); - - for(i = 0; addrs != 0 && i < RTAX_MAX; addrs &= ~(1<sa_family); + + for(cp = cp0, i = 0; i < RTAX_MAX; i++) { - if (!(addrs & 1<ifam_addrs & (1<sa_len == 0) +#ifdef HAVE_SYS_SYSCTL_H + if (sa->sa_len == 0) continue; +#endif switch(sa->sa_family) { case AF_INET: switch (1<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)); @@ -149,10 +179,17 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) case AF_INET6: switch (1<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)); +#ifdef __KAME__ + if (IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)raddr.data.data)) + { + ((struct in6_addr *)raddr.data.data)->s6_addr[2] = 0; + ((struct in6_addr *)raddr.data.data)->s6_addr[3] = 0; + } +#endif raddr_valid = 1; default: break; @@ -177,9 +214,12 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) 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 (raddr.proto == AVAHI_PROTO_INET6) + { + addriface->global_scope = !(IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)raddr.data.data) || IN6_IS_ADDR_MULTICAST((struct in6_addr *)raddr.data.data)); + } + else + addriface->global_scope = 1; } else { @@ -189,16 +229,16 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) 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) +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", rtm->rtm_version); @@ -218,7 +258,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; @@ -236,17 +276,18 @@ 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); } int avahi_interface_monitor_init_osdep(AvahiInterfaceMonitor *m) { int fd = -1; - m->osdep.pfroute = NULL; assert(m); + m->osdep.pfroute = NULL; + if ((fd = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC)) < 0) { avahi_log_error(__FILE__": socket(PF_ROUTE): %s", strerror(errno)); goto fail; @@ -258,15 +299,15 @@ int avahi_interface_monitor_init_osdep(AvahiInterfaceMonitor *m) { } m->osdep.pfroute->fd = fd; - if (!(m->osdep.pfroute->watch = m->server->poll_api->watch_new(m->server->poll_api, - m->osdep.pfroute->fd, - AVAHI_WATCH_IN, - socket_event, + if (!(m->osdep.pfroute->watch = m->server->poll_api->watch_new(m->server->poll_api, + m->osdep.pfroute->fd, + AVAHI_WATCH_IN, + socket_event, m))) { avahi_log_error(__FILE__": Failed to create watch."); goto fail; } - + return 0; fail: @@ -274,10 +315,10 @@ fail: if (m->osdep.pfroute) { if (m->osdep.pfroute->watch) m->server->poll_api->watch_free(m->osdep.pfroute->watch); - + if (fd >= 0) close(fd); - + m->osdep.pfroute = NULL; } @@ -290,7 +331,7 @@ void avahi_interface_monitor_free_osdep(AvahiInterfaceMonitor *m) { if (m->osdep.pfroute) { if (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); @@ -299,14 +340,124 @@ void avahi_interface_monitor_free_osdep(AvahiInterfaceMonitor *m) { } } +#if defined (SIOCGLIFNUM) && defined(HAVE_STRUCT_LIFCONF) /* Solaris 8 and later; Sol 7? */ +/* + * I got this function from GNU zsbra + */ +static int ip6_masklen (struct in6_addr netmask) { + int len = 0; + unsigned char val; + unsigned char *pnt; + + pnt = (unsigned char *) & netmask; + + while ((*pnt == 0xff) && len < 128) { + len += 8; + pnt++; + } + + if (len < 128) { + val = *pnt; + while (val) { + len++; + val <<= 1; + } + } + return len; +} + +static void if_add_interface(struct lifreq *lifreq, AvahiInterfaceMonitor *m, int fd, int count) +{ + AvahiHwInterface *hw; + AvahiAddress addr; + struct lifreq lifrcopy; + unsigned int index; + int flags; + int mtu; + int prefixlen; + AvahiInterfaceAddress *addriface; + AvahiInterface *iface; + struct sockaddr_in mask; + struct sockaddr_in6 mask6; + char caddr[AVAHI_ADDRESS_STR_MAX]; + + lifrcopy = *lifreq; + + if (ioctl(fd, SIOCGLIFFLAGS, &lifrcopy) < 0) { + avahi_log_error(__FILE__": ioctl(SIOCGLIFFLAGS) %s", strerror(errno)); + return; + } + flags = lifrcopy.lifr_flags; + + if (ioctl(fd, SIOCGLIFMTU, &lifrcopy) < 0) { + avahi_log_error(__FILE__": ioctl(SIOCGLIFMTU) %s", strerror(errno)); + return; + } + mtu = lifrcopy.lifr_metric; + + if (ioctl(fd, SIOCGLIFADDR, &lifrcopy) < 0) { + avahi_log_error(__FILE__": ioctl(SIOCGLIFADDR) %s", strerror(errno)); + return; + } + addr.proto = avahi_af_to_proto(lifreq->lifr_addr.ss_family); + if (ioctl(fd, SIOCGLIFNETMASK, &lifrcopy) < 0) { + avahi_log_error(__FILE__": ioctl(SIOCGLIFNETMASK) %s", strerror(errno)); + return; + } + switch (lifreq->lifr_addr.ss_family) { + case AF_INET: + memcpy(addr.data.data, &((struct sockaddr_in *)&lifreq->lifr_addr)->sin_addr, sizeof(struct in_addr)); + memcpy(&mask, &((struct sockaddr_in *)&lifrcopy.lifr_addr)->sin_addr, sizeof(struct in_addr)); + prefixlen = bitcount((unsigned int) mask.sin_addr.s_addr); + break; + case AF_INET6: + memcpy(addr.data.data, &((struct sockaddr_in6 *)&lifreq->lifr_addr)->sin6_addr, sizeof(struct in6_addr)); + memcpy(&mask6, &((struct sockaddr_in6 *)&lifrcopy.lifr_addr)->sin6_addr, sizeof(struct in6_addr)); + prefixlen = lifrcopy.lifr_addrlen; + break; + default: + break; + } + index = if_nametoindex(lifreq->lifr_name); + + if (!(hw = avahi_interface_monitor_get_hw_interface(m, (AvahiIfIndex) index))) { + if (!(hw = avahi_hw_interface_new(m, (AvahiIfIndex) index))) + return; /* OOM */ + + hw->flags_ok = + (flags & IFF_UP) && + (!m->server->config.use_iff_running || (flags & IFF_RUNNING)) && + !(flags & IFF_LOOPBACK) && + (flags & IFF_MULTICAST) && + (m->server->config.allow_point_to_point || !(flags & IFF_POINTOPOINT)); + hw->name = avahi_strdup(lifreq->lifr_name); + hw->mtu = mtu; + /* TODO get mac address */ + } + + if (!(iface = avahi_interface_monitor_get_interface(m, (AvahiIfIndex)index, addr.proto))) + return; + + if (!(addriface = avahi_interface_monitor_get_address(m, iface, &addr))) + if (!(addriface = avahi_interface_address_new(m, iface, &addr, prefixlen))) + return; /* OOM */ + + addriface->global_scope = 1; + + avahi_hw_interface_check_relevant(hw); + avahi_hw_interface_update_rrs(hw, 0); +} +#endif + void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) { +#ifndef HAVE_STRUCT_LIFCONF 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; @@ -315,11 +466,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; @@ -328,11 +488,56 @@ 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; avahi_interface_monitor_check_relevant(m); avahi_interface_monitor_update_rrs(m, 0); avahi_log_info("Network interface enumeration completed."); +#elif defined (SIOCGLIFNUM) && defined(HAVE_STRUCT_LIFCONF) /* Solaris 8 and later; Sol 7? */ + int sockfd; + int ret; + int n; + struct lifnum lifn; + struct lifconf lifc; + struct lifreq *lifreq; + + if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + avahi_log_error(__FILE__": socket(PFROUTE): %s", strerror(errno)); + return; + } + lifc.lifc_buf = NULL; + lifn.lifn_family = AF_UNSPEC; + lifn.lifn_flags = 0; + if (ioctl(sockfd, SIOCGLIFNUM, &lifn) < 0) { + avahi_log_error(__FILE__": ioctl(SIOCGLIFNUM): %s", strerror(errno)); + goto end; + } + lifc.lifc_len = lifn.lifn_count * sizeof (struct lifreq); + if ((lifc.lifc_buf = avahi_malloc(lifc.lifc_len)) == NULL) { + avahi_log_error("malloc failed in avahi_interface_monitor_sync"); + goto end; + } + lifc.lifc_family = NULL; + lifc.lifc_flags = 0; + if(ioctl(sockfd, SIOCGLIFCONF, &lifc) < 0) { + avahi_log_error(__FILE__": ioctl(SIOCGLIFCONF): %s", strerror(errno)); + goto end; + } + lifreq = lifc.lifc_req; + + for (n = 0; n < lifc.lifc_len; n += sizeof(struct lifreq)) { + if_add_interface(lifreq, m, sockfd, lifn.lifn_count); + lifreq++; + } + m->list_complete = 1; + avahi_interface_monitor_check_relevant(m); + avahi_interface_monitor_update_rrs(m, 0); +end: + close(sockfd); + avahi_free(lifc.lifc_buf); + + avahi_log_info("Network interface enumeration completed."); +#endif }