#include "dns.h"
#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)) {
for (i = hw->interfaces; i; i = i->by_hardware_next)
update_interface_rr(m, i, remove);
+
+ if (!remove &&
+ m->server->config.publish_workstation &&
+ (m->server->state == AVAHI_SERVER_RUNNING ||
+ m->server->state == AVAHI_SERVER_REGISTERING)) {
+
+ if (!hw->entry_group) {
+ gchar *name;
+ gchar *t = avahi_format_mac_address(hw->mac_address, hw->mac_address_size);
+ name = g_strdup_printf("%s [%s]", m->server->host_name, t);
+ 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);
+
+ g_free(name);
+ }
+
+ } else {
+
+ if (hw->entry_group) {
+
+ if (avahi_entry_group_get_state(hw->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING)
+ avahi_server_decrease_host_rr_pending(m->server);
+
+ avahi_entry_group_free(hw->entry_group);
+ hw->entry_group = NULL;
+ }
+ }
}
static void free_address(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a) {
g_assert(a);
g_assert(a->interface);
+ update_address_rr(m, a, TRUE);
AVAHI_LLIST_REMOVE(AvahiInterfaceAddress, address, a->interface->addresses, a);
-
- if (a->entry_group)
- avahi_entry_group_free(a->entry_group);
g_free(a);
}
g_assert(!i->announcements);
+ update_interface_rr(m, i, TRUE);
+
while (i->addresses)
free_address(m, i->addresses);
g_assert(m);
g_assert(hw);
+ update_hw_interface_rr(m, hw, TRUE);
+
while (hw->interfaces)
free_interface(m, hw->interfaces, send_goodbye);
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)
avahi_mdns_mcast_join_ipv4(i->hardware->index, m->server->fd_ipv4);
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)
avahi_mdns_mcast_leave_ipv4(i->hardware->index, m->server->fd_ipv4);
hw->flags = 0;
hw->mtu = 1500;
hw->index = ifinfomsg->ifi_index;
+ hw->mac_address_size = 0;
+ hw->entry_group = NULL;
AVAHI_LLIST_HEAD_INIT(AvahiInterface, hw->interfaces);
AVAHI_LLIST_PREPEND(AvahiHwInterface, hardware, m->hw_interfaces, hw);
g_assert(RTA_PAYLOAD(a) == sizeof(unsigned int));
hw->mtu = *((unsigned int*) RTA_DATA(a));
break;
+
+ case IFLA_ADDRESS: {
+ hw->mac_address_size = RTA_PAYLOAD(a);
+ if (hw->mac_address_size > AVAHI_MAX_MAC_ADDRESS)
+ hw->mac_address_size = AVAHI_MAX_MAC_ADDRESS;
+
+ memcpy(hw->mac_address, RTA_DATA(a), hw->mac_address_size);
+ break;
+ }
default:
;
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));
}
}
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)
avahi_send_dns_packet_ipv4(i->monitor->server->fd_ipv4, i->hardware->index, p, a ? &a->data.ipv4 : 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), */
}
void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove) {
- AvahiInterface *i;
+ AvahiHwInterface *hw;
g_assert(m);
- for (i = m->interfaces; i; i = i->interface_next)
- update_interface_rr(m, i, remove);
+ for (hw = m->hw_interfaces; hw; hw = hw->hardware_next)
+ update_hw_interface_rr(m, hw, remove);
}
gboolean avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a) {