#include "socket.h"
#include "announce.h"
#include "util.h"
+#include "log.h"
static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a, gboolean remove) {
g_assert(m);
if (avahi_interface_address_relevant(a) &&
!remove &&
- m->server->config.register_addresses &&
+ m->server->config.publish_addresses &&
(m->server->state == AVAHI_SERVER_RUNNING ||
m->server->state == AVAHI_SERVER_REGISTERING)) {
if (!a->entry_group) {
a->entry_group = avahi_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL);
- avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, a->interface->protocol, 0, NULL, &a->address);
- avahi_entry_group_commit(a->entry_group);
+ if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, a->interface->protocol, 0, NULL, &a->address) < 0) {
+ avahi_log_warn(__FILE__": avahi_server_add_address() failed.");
+ avahi_entry_group_free(a->entry_group);
+ a->entry_group = NULL;
+ } else
+ avahi_entry_group_commit(a->entry_group);
}
} else {
update_interface_rr(m, i, remove);
if (!remove &&
- m->server->config.register_workstation &&
+ m->server->config.publish_workstation &&
(m->server->state == AVAHI_SERVER_RUNNING ||
m->server->state == AVAHI_SERVER_REGISTERING)) {
g_free(t);
hw->entry_group = avahi_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL);
- avahi_server_add_service(m->server, hw->entry_group, hw->index, AF_UNSPEC, "_workstation._tcp", name, NULL, NULL, 9, NULL);
- avahi_entry_group_commit(hw->entry_group);
+ if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AVAHI_PROTO_UNSPEC, "_workstation._tcp", name, NULL, NULL, 9, NULL) < 0) {
+ avahi_log_warn(__FILE__": avahi_server_add_service() failed.");
+ avahi_entry_group_free(hw->entry_group);
+ hw->entry_group = NULL;
+ } else
+ avahi_entry_group_commit(hw->entry_group);
g_free(name);
}
return avahi_netlink_send(nl, n, ret_seq);
}
-static void new_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, guchar protocol) {
+static void new_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, AvahiProtocol protocol) {
AvahiInterface *i;
g_assert(m);
g_assert(hw);
- g_assert(protocol != AF_UNSPEC);
+ g_assert(protocol != AVAHI_PROTO_UNSPEC);
i = g_new(AvahiInterface, 1);
i->monitor = m;
b = avahi_interface_relevant(i);
if (b && !i->announcing) {
- g_message("New relevant interface %s.%i (#%i)", i->hardware->name, i->protocol, i->hardware->index);
+ avahi_log_debug("New relevant interface %s.%i (#%i)", i->hardware->name, i->protocol, i->hardware->index);
- if (i->protocol == AF_INET)
+ if (i->protocol == AVAHI_PROTO_INET)
avahi_mdns_mcast_join_ipv4(i->hardware->index, m->server->fd_ipv4);
- if (i->protocol == AF_INET6)
+ if (i->protocol == AVAHI_PROTO_INET6)
avahi_mdns_mcast_join_ipv6(i->hardware->index, m->server->fd_ipv6);
i->announcing = TRUE;
avahi_announce_interface(m->server, i);
+ avahi_browser_new_interface(m->server, i);
} else if (!b && i->announcing) {
- g_message("Interface %s.%i no longer relevant", i->hardware->name, i->protocol);
+ avahi_log_debug("Interface %s.%i no longer relevant", i->hardware->name, i->protocol);
- if (i->protocol == AF_INET)
+ if (i->protocol == AVAHI_PROTO_INET)
avahi_mdns_mcast_leave_ipv4(i->hardware->index, m->server->fd_ipv4);
- if (i->protocol == AF_INET6)
+ if (i->protocol == AVAHI_PROTO_INET6)
avahi_mdns_mcast_leave_ipv6(i->hardware->index, m->server->fd_ipv6);
avahi_goodbye_interface(m->server, i, FALSE);
g_hash_table_insert(m->hash_table, &hw->index, hw);
if (m->server->fd_ipv4 >= 0)
- new_interface(m, hw, AF_INET);
+ new_interface(m, hw, AVAHI_PROTO_INET);
if (m->server->fd_ipv6 >= 0)
- new_interface(m, hw, AF_INET6);
+ new_interface(m, hw, AVAHI_PROTO_INET6);
}
hw->flags = ifinfomsg->ifi_flags;
AvahiAddress raddr;
gboolean raddr_valid = FALSE;
- if (ifaddrmsg->ifa_family != AF_INET && ifaddrmsg->ifa_family != AF_INET6)
+ if (ifaddrmsg->ifa_family != AVAHI_PROTO_INET && ifaddrmsg->ifa_family != AVAHI_PROTO_INET6)
return;
if (!(i = (AvahiInterface*) avahi_interface_monitor_get_interface(m, ifaddrmsg->ifa_index, ifaddrmsg->ifa_family)))
switch(a->rta_type) {
case IFA_ADDRESS:
- if ((raddr.family == AF_INET6 && RTA_PAYLOAD(a) != 16) ||
- (raddr.family == AF_INET && RTA_PAYLOAD(a) != 4))
+ if ((raddr.family == AVAHI_PROTO_INET6 && RTA_PAYLOAD(a) != 16) ||
+ (raddr.family == AVAHI_PROTO_INET && RTA_PAYLOAD(a) != 4))
return;
memcpy(raddr.data.data, RTA_DATA(a), RTA_PAYLOAD(a));
raddr_valid = TRUE;
break;
-
+
default:
;
}
addr->flags = ifaddrmsg->ifa_flags;
addr->scope = ifaddrmsg->ifa_scope;
+ addr->prefix_len = ifaddrmsg->ifa_prefixlen;
update_address_rr(m, addr, FALSE);
check_interface_relevant(m, i);
m->list = LIST_DONE;
if (netlink_list_items(m->netlink, RTM_GETADDR, &m->query_addr_seq) < 0)
- g_warning("NETLINK: Failed to list addrs: %s", strerror(errno));
+ avahi_log_warn("NETLINK: Failed to list addrs: %s", strerror(errno));
else
m->list = LIST_ADDR;
} else {
m->list = LIST_DONE;
- g_message("Enumeration complete");
+ avahi_log_debug("Enumeration complete");
}
} else if (n->nlmsg_type == NLMSG_ERROR && (n->nlmsg_seq == m->query_link_seq || n->nlmsg_seq == m->query_addr_seq)) {
struct nlmsgerr *e = NLMSG_DATA (n);
if (e->error)
- g_warning("NETLINK: Failed to browse: %s", strerror(-e->error));
+ avahi_log_warn("NETLINK: Failed to browse: %s", strerror(-e->error));
}
}
}
-AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, gint index, guchar protocol) {
+AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, AvahiIfIndex index, AvahiProtocol protocol) {
AvahiHwInterface *hw;
AvahiInterface *i;
g_assert(m);
g_assert(index > 0);
- g_assert(protocol != AF_UNSPEC);
+ g_assert(protocol != AVAHI_PROTO_UNSPEC);
if (!(hw = avahi_interface_monitor_get_hw_interface(m, index)))
return NULL;
return NULL;
}
-AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint index) {
+AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, AvahiIfIndex index) {
g_assert(m);
g_assert(index > 0);
g_assert(!a || a->family == i->protocol);
/* if (a) */
-/* g_message("unicast sending on '%s.%i' to %s:%u", i->hardware->name, i->protocol, avahi_address_snprint(t, sizeof(t), a), port); */
+/* avahi_log_debug("unicast sending on '%s.%i' to %s:%u", i->hardware->name, i->protocol, avahi_address_snprint(t, sizeof(t), a), port); */
/* else */
-/* g_message("multicast sending on '%s.%i'", i->hardware->name, i->protocol); */
+/* avahi_log_debug("multicast sending on '%s.%i'", i->hardware->name, i->protocol); */
- if (i->protocol == AF_INET && i->monitor->server->fd_ipv4 >= 0)
+ if (i->protocol == AVAHI_PROTO_INET && i->monitor->server->fd_ipv4 >= 0)
avahi_send_dns_packet_ipv4(i->monitor->server->fd_ipv4, i->hardware->index, p, a ? &a->data.ipv4 : NULL, port);
- else if (i->protocol == AF_INET6 && i->monitor->server->fd_ipv6 >= 0)
+ else if (i->protocol == AVAHI_PROTO_INET6 && i->monitor->server->fd_ipv6 >= 0)
avahi_send_dns_packet_ipv6(i->monitor->server->fd_ipv6, i->hardware->index, p, a ? &a->data.ipv6 : NULL, port);
}
break;
}
-/* g_message("%p. iface-relevant: %i %i %i %i %i %i", i, relevant_address, */
+/* avahi_log_debug("%p. iface-relevant: %i %i %i %i %i %i", i, relevant_address, */
/* (i->hardware->flags & IFF_UP), */
/* (i->hardware->flags & IFF_RUNNING), */
/* !(i->hardware->flags & IFF_LOOPBACK), */
}
-gboolean avahi_interface_match(AvahiInterface *i, gint index, guchar protocol) {
+gboolean avahi_interface_match(AvahiInterface *i, AvahiIfIndex index, AvahiProtocol protocol) {
g_assert(i);
if (index > 0 && index != i->hardware->index)
return FALSE;
- if (protocol != AF_UNSPEC && protocol != i->protocol)
+ if (protocol != AVAHI_PROTO_UNSPEC && protocol != i->protocol)
return FALSE;
return TRUE;
}
-void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, gint interface, guchar protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata) {
+void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, AvahiIfIndex interface, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata) {
g_assert(m);
g_assert(callback);
if (interface > 0) {
- if (protocol != AF_UNSPEC) {
+ if (protocol != AVAHI_PROTO_UNSPEC) {
AvahiInterface *i;
if ((i = avahi_interface_monitor_get_interface(m, interface, protocol)))
return FALSE;
}
+
+gboolean avahi_interface_address_on_link(AvahiInterface *i, const AvahiAddress *a) {
+ AvahiInterfaceAddress *ia;
+
+ g_assert(i);
+ g_assert(a);
+
+ if (a->family != i->protocol)
+ return FALSE;
+
+ for (ia = i->addresses; ia; ia = ia->address_next) {
+
+ if (a->family == AVAHI_PROTO_INET) {
+ guint32 m;
+
+ m = ~(((guint32) -1) >> ia->prefix_len);
+
+ if ((g_ntohl(a->data.ipv4.address) & m) == (g_ntohl(ia->address.data.ipv4.address) & m))
+ return TRUE;
+ } else {
+ guint i;
+ guchar pl;
+ g_assert(a->family == AVAHI_PROTO_INET6);
+
+ pl = ia->prefix_len;
+
+ for (i = 0; i < 16; i++) {
+ guint8 m;
+
+ if (pl == 0)
+ return TRUE;
+
+ if (pl >= 8) {
+ m = 0xFF;
+ pl -= 8;
+ } else {
+ m = ~(0xFF >> pl);
+ pl = 0;
+ }
+
+ if ((a->data.ipv6.address[i] & m) != (ia->address.data.ipv6.address[i] & m))
+ break;
+ }
+ }
+ }
+
+ return FALSE;
+}