#include "socket.h"
#include "announce.h"
-static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a, int remove) {
+static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a, gboolean remove) {
g_assert(m);
g_assert(a);
- if (!avahi_interface_address_relevant(a) || remove) {
+ if (avahi_interface_address_relevant(a) &&
+ !remove &&
+ m->server->config.register_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);
+ }
+ } else {
+
if (a->entry_group) {
+
+ if (avahi_entry_group_get_state(a->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING)
+ avahi_server_decrease_host_rr_pending(m->server);
+
avahi_entry_group_free(a->entry_group);
a->entry_group = NULL;
}
- } else {
- if (!a->entry_group) {
- a->entry_group = avahi_entry_group_new(m->server, NULL, NULL);
- avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, AF_UNSPEC, 0, NULL, &a->address);
- avahi_entry_group_commit(a->entry_group);
- }
- }
+ }
}
-static void update_interface_rr(AvahiInterfaceMonitor *m, AvahiInterface *i, int remove) {
+static void update_interface_rr(AvahiInterfaceMonitor *m, AvahiInterface *i, gboolean remove) {
AvahiInterfaceAddress *a;
+
g_assert(m);
g_assert(i);
update_address_rr(m, a, remove);
}
-static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, int remove) {
+static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, gboolean remove) {
AvahiInterface *i;
g_assert(m);
g_assert(m);
g_assert(i);
- g_message("removing interface %s.%i", i->hardware->name, i->protocol);
avahi_goodbye_interface(m->server, i, send_goodbye);
- g_message("forcing responses...");
avahi_response_scheduler_force(i->response_scheduler);
- g_message("done");
g_assert(!i->announcements);
n = (struct nlmsghdr*) req;
n->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg));
n->nlmsg_type = type;
- n->nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+ n->nlmsg_flags = NLM_F_ROOT/*|NLM_F_MATCH*/|NLM_F_REQUEST;
n->nlmsg_pid = 0;
gen = NLMSG_DATA(n);
b = avahi_interface_relevant(i);
if (b && !i->announcing) {
- g_message("New relevant interface %s.%i", i->hardware->name, i->protocol);
+ g_message("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);
+ avahi_mdns_mcast_join_ipv4(i->hardware->index, m->server->fd_ipv4);
if (i->protocol == AF_INET6)
- avahi_mdns_mcast_join_ipv6 (i->hardware->index, m->server->fd_ipv6);
+ avahi_mdns_mcast_join_ipv6(i->hardware->index, m->server->fd_ipv6);
i->announcing = TRUE;
avahi_announce_interface(m->server, i);
g_message("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);
+ avahi_mdns_mcast_leave_ipv4(i->hardware->index, m->server->fd_ipv4);
if (i->protocol == AF_INET6)
- avahi_mdns_mcast_leave_ipv6 (i->hardware->index, m->server->fd_ipv6);
+ avahi_mdns_mcast_leave_ipv6(i->hardware->index, m->server->fd_ipv6);
avahi_goodbye_interface(m->server, i, FALSE);
avahi_response_scheduler_clear(i->response_scheduler);
struct rtattr *a = NULL;
size_t l;
AvahiAddress raddr;
- int raddr_valid = 0;
+ gboolean raddr_valid = FALSE;
if (ifaddrmsg->ifa_family != AF_INET && ifaddrmsg->ifa_family != AF_INET6)
return;
raddr.family = ifaddrmsg->ifa_family;
- l = NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg));
+ l = NLMSG_PAYLOAD(n, sizeof(struct ifaddrmsg));
a = IFA_RTA(ifaddrmsg);
while (RTA_OK(a, l)) {
+
switch(a->rta_type) {
case IFA_ADDRESS:
if ((raddr.family == AF_INET6 && RTA_PAYLOAD(a) != 16) ||
return;
memcpy(raddr.data.data, RTA_DATA(a), RTA_PAYLOAD(a));
- raddr_valid = 1;
+ raddr_valid = TRUE;
break;
a = RTA_NEXT(a, l);
}
-
if (!raddr_valid)
return;
void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, guint16 port) {
g_assert(i);
g_assert(p);
- char t[64];
+/* char t[64]; */
if (!avahi_interface_relevant(i))
return;
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);
- else
- g_message("multicast sending on '%s.%i'", i->hardware->name, 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); */
+/* else */
+/* g_message("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);
}
gboolean avahi_interface_relevant(AvahiInterface *i) {
+ AvahiInterfaceAddress *a;
+ gboolean relevant_address;
+
g_assert(i);
+ relevant_address = FALSE;
+
+ for (a = i->addresses; a; a = a->address_next)
+ if (avahi_interface_address_relevant(a)) {
+ relevant_address = TRUE;
+ break;
+ }
+
+/* g_message("%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), */
+/* (i->hardware->flags & IFF_MULTICAST), */
+/* !(i->hardware->flags & IFF_POINTOPOINT)); */
+
return
(i->hardware->flags & IFF_UP) &&
- (i->hardware->flags & IFF_RUNNING) &&
+ (!i->monitor->server->config.use_iff_running || (i->hardware->flags & IFF_RUNNING)) &&
!(i->hardware->flags & IFF_LOOPBACK) &&
(i->hardware->flags & IFF_MULTICAST) &&
- i->addresses;
+ !(i->hardware->flags & IFF_POINTOPOINT) &&
+ relevant_address;
}
gboolean avahi_interface_address_relevant(AvahiInterfaceAddress *a) {
return TRUE;
}
-
void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, gint interface, guchar protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata) {
g_assert(m);
g_assert(callback);
callback(m, i, userdata);
}
}
+
+void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove) {
+ AvahiInterface *i;
+
+ g_assert(m);
+
+ for (i = m->interfaces; i; i = i->interface_next)
+ update_interface_rr(m, i, remove);
+}