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);
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
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));
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));
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);
}
}
-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;
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);
}
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;
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;