X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fiface-pfroute.c;h=f96bfc2924f827322d1ac090586fc6e4fb441c03;hb=bbf6b92f662ed909d5b4fca4a43b19e815812b3e;hp=56149dae83ee7ff2e0f96bd4c0494278fa95f0f7;hpb=d266407d3e6d8f2a8e14e8bd2f89fa8a4333613c;p=catta diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c index 56149da..f96bfc2 100644 --- a/avahi-core/iface-pfroute.c +++ b/avahi-core/iface-pfroute.c @@ -31,7 +31,12 @@ #include #include +#include +#ifdef HAVE_SYS_SYSCTL_H #include +#else +#include +#endif #include #include @@ -79,7 +84,7 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) (!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); @@ -87,16 +92,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); @@ -104,7 +112,11 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) #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) { @@ -118,6 +130,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; @@ -131,13 +148,15 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) if (!(addrs & 1<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)); @@ -145,7 +164,18 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) default: break; } + break; case AF_INET6: + switch (1<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,7 +213,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); @@ -207,7 +237,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,26 +249,24 @@ 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("socket_event: got 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); } 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; @@ -291,7 +319,117 @@ 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; @@ -307,11 +445,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,11 +467,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 }