#include "netlink.h"
#include "dns.h"
#include "socket.h"
+#include "announce.h"
-static void update_address_rr(flxInterfaceMonitor *m, flxInterfaceAddress *a, int remove) {
+static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a, int remove) {
g_assert(m);
g_assert(a);
- if (!flx_address_is_relevant(a) || remove) {
- if (a->rr_id >= 0) {
- flx_server_remove(m->server, a->rr_id);
- a->rr_id = -1;
+ if (!avahi_interface_address_relevant(a) || remove) {
+ if (a->entry_group) {
+ avahi_entry_group_free(a->entry_group);
+ a->entry_group = NULL;
}
} else {
- if (a->rr_id < 0) {
- a->rr_id = flx_server_get_next_id(m->server);
- flx_server_add_address(m->server, a->rr_id, a->interface->index, AF_UNSPEC, FALSE, m->server->hostname, &a->address);
+ 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(flxInterfaceMonitor *m, flxInterface *i, int remove) {
- flxInterfaceAddress *a;
+static void update_interface_rr(AvahiInterfaceMonitor *m, AvahiInterface *i, int remove) {
+ AvahiInterfaceAddress *a;
g_assert(m);
g_assert(i);
update_address_rr(m, a, remove);
}
-static void free_address(flxInterfaceMonitor *m, flxInterfaceAddress *a) {
+static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, int remove) {
+ AvahiInterface *i;
+
+ g_assert(m);
+ g_assert(hw);
+
+ for (i = hw->interfaces; i; i = i->by_hardware_next)
+ update_interface_rr(m, i, remove);
+}
+
+static void free_address(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a) {
g_assert(m);
g_assert(a);
g_assert(a->interface);
- if (a->address.family == AF_INET)
- a->interface->n_ipv4_addrs --;
- else if (a->address.family == AF_INET6)
- a->interface->n_ipv6_addrs --;
-
- FLX_LLIST_REMOVE(flxInterfaceAddress, address, a->interface->addresses, a);
+ AVAHI_LLIST_REMOVE(AvahiInterfaceAddress, address, a->interface->addresses, a);
- flx_server_remove(m->server, a->rr_id);
+ if (a->entry_group)
+ avahi_entry_group_free(a->entry_group);
g_free(a);
}
-static void free_interface(flxInterfaceMonitor *m, flxInterface *i) {
+static void free_interface(AvahiInterfaceMonitor *m, AvahiInterface *i, gboolean send_goodbye) {
g_assert(m);
g_assert(i);
- if (i->ipv4_scheduler)
- flx_packet_scheduler_free(i->ipv4_scheduler);
- if (i->ipv6_scheduler)
- flx_packet_scheduler_free(i->ipv6_scheduler);
+ g_message("removing interface %s.%i", i->hardware->name, i->protocol);
+ avahi_goodbye_interface(m->server, i, send_goodbye);
+ g_message("flushing...");
+ avahi_packet_scheduler_flush_responses(i->scheduler);
+ g_message("done");
+ g_assert(!i->announcements);
+
while (i->addresses)
free_address(m, i->addresses);
- if (i->ipv4_cache)
- flx_cache_free(i->ipv4_cache);
- if (i->ipv6_cache)
- flx_cache_free(i->ipv6_cache);
+ avahi_packet_scheduler_free(i->scheduler);
+ avahi_cache_free(i->cache);
- g_assert(i->n_ipv6_addrs == 0);
- g_assert(i->n_ipv4_addrs == 0);
-
- FLX_LLIST_REMOVE(flxInterface, interface, m->interfaces, i);
- g_hash_table_remove(m->hash_table, &i->index);
-
- flx_cache_free(i->ipv4_cache);
- flx_cache_free(i->ipv6_cache);
+ AVAHI_LLIST_REMOVE(AvahiInterface, interface, m->interfaces, i);
+ AVAHI_LLIST_REMOVE(AvahiInterface, by_hardware, i->hardware->interfaces, i);
- g_free(i->name);
g_free(i);
}
-static flxInterfaceAddress* get_address(flxInterfaceMonitor *m, flxInterface *i, const flxAddress *raddr) {
- flxInterfaceAddress *ia;
+static void free_hw_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, gboolean send_goodbye) {
+ g_assert(m);
+ g_assert(hw);
+
+ while (hw->interfaces)
+ free_interface(m, hw->interfaces, send_goodbye);
+
+ AVAHI_LLIST_REMOVE(AvahiHwInterface, hardware, m->hw_interfaces, hw);
+ g_hash_table_remove(m->hash_table, &hw->index);
+
+ g_free(hw->name);
+ g_free(hw);
+}
+
+static AvahiInterfaceAddress* get_address(AvahiInterfaceMonitor *m, AvahiInterface *i, const AvahiAddress *raddr) {
+ AvahiInterfaceAddress *ia;
g_assert(m);
g_assert(i);
g_assert(raddr);
for (ia = i->addresses; ia; ia = ia->address_next)
- if (flx_address_cmp(&ia->address, raddr) == 0)
+ if (avahi_address_cmp(&ia->address, raddr) == 0)
return ia;
return NULL;
}
-static int netlink_list_items(flxNetlink *nl, guint16 type, guint *ret_seq) {
+static int netlink_list_items(AvahiNetlink *nl, guint16 type, guint *ret_seq) {
struct nlmsghdr *n;
struct rtgenmsg *gen;
guint8 req[1024];
memset(gen, 0, sizeof(struct rtgenmsg));
gen->rtgen_family = AF_UNSPEC;
- return flx_netlink_send(nl, n, ret_seq);
+ return avahi_netlink_send(nl, n, ret_seq);
}
-static void callback(flxNetlink *nl, struct nlmsghdr *n, gpointer userdata) {
- flxInterfaceMonitor *m = userdata;
+static void new_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, guchar protocol) {
+ AvahiInterface *i;
+
+ g_assert(m);
+ g_assert(hw);
+ g_assert(protocol != AF_UNSPEC);
+
+ i = g_new(AvahiInterface, 1);
+ i->monitor = m;
+ i->hardware = hw;
+ i->protocol = protocol;
+ i->announcing = FALSE;
+
+ AVAHI_LLIST_HEAD_INIT(AvahiInterfaceAddress, i->addresses);
+ AVAHI_LLIST_HEAD_INIT(AvahiAnnouncement, i->announcements);
+
+ i->cache = avahi_cache_new(m->server, i);
+ i->scheduler = avahi_packet_scheduler_new(m->server, i);
+
+ AVAHI_LLIST_PREPEND(AvahiInterface, by_hardware, hw->interfaces, i);
+ AVAHI_LLIST_PREPEND(AvahiInterface, interface, m->interfaces, i);
+}
+
+static void check_interface_relevant(AvahiInterfaceMonitor *m, AvahiInterface *i) {
+ gboolean b;
+
+ g_assert(m);
+ g_assert(i);
+
+ b = avahi_interface_relevant(i);
+
+ if (b && !i->announcing) {
+ g_message("New relevant interface %s.%i", i->hardware->name, i->protocol);
+
+ if (i->protocol == AF_INET)
+ 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);
+
+ i->announcing = TRUE;
+ avahi_announce_interface(m->server, i);
+ } else if (!b && i->announcing) {
+ g_message("Interface %s.%i no longer relevant", i->hardware->name, i->protocol);
+
+ avahi_goodbye_interface(m->server, i, FALSE);
+
+ if (i->protocol == AF_INET)
+ 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);
+
+ i->announcing = FALSE;
+ }
+}
+
+static void check_hw_interface_relevant(AvahiInterfaceMonitor *m, AvahiHwInterface *hw) {
+ AvahiInterface *i;
+
+ g_assert(m);
+ g_assert(hw);
+
+ for (i = hw->interfaces; i; i = i->by_hardware_next)
+ check_interface_relevant(m, i);
+}
+
+static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) {
+ AvahiInterfaceMonitor *m = userdata;
g_assert(m);
g_assert(n);
if (n->nlmsg_type == RTM_NEWLINK) {
struct ifinfomsg *ifinfomsg = NLMSG_DATA(n);
- flxInterface *i;
+ AvahiHwInterface *hw;
struct rtattr *a = NULL;
size_t l;
- int changed;
if (ifinfomsg->ifi_family != AF_UNSPEC)
return;
- if ((i = (flxInterface*) flx_interface_monitor_get_interface(m, ifinfomsg->ifi_index)))
- changed = 1;
- else {
- i = g_new(flxInterface, 1);
- i->monitor = m;
- i->name = NULL;
- i->index = ifinfomsg->ifi_index;
- i->addresses = NULL;
- i->n_ipv4_addrs = i->n_ipv6_addrs = 0;
- FLX_LLIST_PREPEND(flxInterface, interface, m->interfaces, i);
- g_hash_table_insert(m->hash_table, &i->index, i);
- i->mtu = 1500;
- i->ipv4_cache = flx_cache_new(m->server, i, AF_INET);
- i->ipv6_cache = flx_cache_new(m->server, i, AF_INET6);
- i->ipv4_scheduler = flx_packet_scheduler_new(m->server, i, AF_INET);
- i->ipv6_scheduler = flx_packet_scheduler_new(m->server, i, AF_INET6);
+ if (!(hw = g_hash_table_lookup(m->hash_table, &ifinfomsg->ifi_index))) {
+ hw = g_new(AvahiHwInterface, 1);
+ hw->monitor = m;
+ hw->name = NULL;
+ hw->flags = 0;
+ hw->mtu = 1500;
+ hw->index = ifinfomsg->ifi_index;
+
+ AVAHI_LLIST_HEAD_INIT(AvahiInterface, hw->interfaces);
+ AVAHI_LLIST_PREPEND(AvahiHwInterface, hardware, m->hw_interfaces, hw);
- changed = 0;
+ g_hash_table_insert(m->hash_table, &hw->index, hw);
+
+ if (m->server->fd_ipv4 >= 0)
+ new_interface(m, hw, AF_INET);
+ if (m->server->fd_ipv6 >= 0)
+ new_interface(m, hw, AF_INET6);
}
- i->flags = ifinfomsg->ifi_flags;
+ hw->flags = ifinfomsg->ifi_flags;
l = NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg));
a = IFLA_RTA(ifinfomsg);
while (RTA_OK(a, l)) {
switch(a->rta_type) {
case IFLA_IFNAME:
- g_free(i->name);
- i->name = g_strndup(RTA_DATA(a), RTA_PAYLOAD(a));
+ g_free(hw->name);
+ hw->name = g_strndup(RTA_DATA(a), RTA_PAYLOAD(a));
break;
case IFLA_MTU:
g_assert(RTA_PAYLOAD(a) == sizeof(unsigned int));
- i->mtu = *((unsigned int*) RTA_DATA(a));
+ hw->mtu = *((unsigned int*) RTA_DATA(a));
break;
default:
a = RTA_NEXT(a, l);
}
- update_interface_rr(m, i, 0);
+ update_hw_interface_rr(m, hw, FALSE);
+ check_hw_interface_relevant(m, hw);
+
} else if (n->nlmsg_type == RTM_DELLINK) {
struct ifinfomsg *ifinfomsg = NLMSG_DATA(n);
- flxInterface *i;
+ AvahiHwInterface *hw;
+ AvahiInterface *i;
if (ifinfomsg->ifi_family != AF_UNSPEC)
return;
- if (!(i = (flxInterface*) flx_interface_monitor_get_interface(m, ifinfomsg->ifi_index)))
+ if (!(hw = avahi_interface_monitor_get_hw_interface(m, ifinfomsg->ifi_index)))
return;
- update_interface_rr(m, i, 1);
- free_interface(m, i);
+ update_hw_interface_rr(m, hw, TRUE);
+ free_hw_interface(m, hw, FALSE);
} else if (n->nlmsg_type == RTM_NEWADDR || n->nlmsg_type == RTM_DELADDR) {
struct ifaddrmsg *ifaddrmsg = NLMSG_DATA(n);
- flxInterface *i;
+ AvahiInterface *i;
struct rtattr *a = NULL;
size_t l;
- int changed;
- flxAddress raddr;
+ AvahiAddress raddr;
int raddr_valid = 0;
if (ifaddrmsg->ifa_family != AF_INET && ifaddrmsg->ifa_family != AF_INET6)
return;
- if (!(i = (flxInterface*) flx_interface_monitor_get_interface(m, ifaddrmsg->ifa_index)))
+ if (!(i = (AvahiInterface*) avahi_interface_monitor_get_interface(m, ifaddrmsg->ifa_index, ifaddrmsg->ifa_family)))
return;
raddr.family = ifaddrmsg->ifa_family;
default:
;
}
-
+
a = RTA_NEXT(a, l);
}
-
+
if (!raddr_valid)
return;
if (n->nlmsg_type == RTM_NEWADDR) {
- flxInterfaceAddress *addr;
+ AvahiInterfaceAddress *addr;
- if ((addr = get_address(m, i, &raddr)))
- changed = 1;
- else {
- addr = g_new(flxInterfaceAddress, 1);
+ if (!(addr = get_address(m, i, &raddr))) {
+ addr = g_new(AvahiInterfaceAddress, 1);
+ addr->monitor = m;
addr->address = raddr;
addr->interface = i;
+ addr->entry_group = NULL;
- if (raddr.family == AF_INET)
- i->n_ipv4_addrs++;
- else if (raddr.family == AF_INET6)
- i->n_ipv6_addrs++;
-
- addr->rr_id = -1;
-
- FLX_LLIST_PREPEND(flxInterfaceAddress, address, i->addresses, addr);
-
- changed = 0;
+ AVAHI_LLIST_PREPEND(AvahiInterfaceAddress, address, i->addresses, addr);
}
addr->flags = ifaddrmsg->ifa_flags;
addr->scope = ifaddrmsg->ifa_scope;
- update_address_rr(m, addr, 0);
+ update_address_rr(m, addr, FALSE);
+ check_interface_relevant(m, i);
} else {
- flxInterfaceAddress *addr;
+ AvahiInterfaceAddress *addr;
if (!(addr = get_address(m, i, &raddr)))
return;
- update_address_rr(m, addr, 1);
+ update_address_rr(m, addr, TRUE);
free_address(m, addr);
+
+ check_interface_relevant(m, i);
}
} else if (n->nlmsg_type == NLMSG_DONE) {
-
+
if (m->list == LIST_IFACE) {
m->list = LIST_DONE;
- if (netlink_list_items(m->netlink, RTM_GETADDR, &m->query_addr_seq) < 0) {
+ if (netlink_list_items(m->netlink, RTM_GETADDR, &m->query_addr_seq) < 0)
g_warning("NETLINK: Failed to list addrs: %s", strerror(errno));
- } else
+ else
m->list = LIST_ADDR;
- } else
+ } else {
m->list = LIST_DONE;
+ g_message("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);
}
}
-flxInterfaceMonitor *flx_interface_monitor_new(flxServer *s) {
- flxInterfaceMonitor *m = NULL;
+AvahiInterfaceMonitor *avahi_interface_monitor_new(AvahiServer *s) {
+ AvahiInterfaceMonitor *m = NULL;
- m = g_new0(flxInterfaceMonitor, 1);
+ m = g_new0(AvahiInterfaceMonitor, 1);
m->server = s;
- if (!(m->netlink = flx_netlink_new(s->context, RTMGRP_LINK|RTMGRP_IPV4_IFADDR|RTMGRP_IPV6_IFADDR, callback, m)))
+ if (!(m->netlink = avahi_netlink_new(s->context, G_PRIORITY_DEFAULT-10, RTMGRP_LINK|RTMGRP_IPV4_IFADDR|RTMGRP_IPV6_IFADDR, callback, m)))
goto fail;
m->hash_table = g_hash_table_new(g_int_hash, g_int_equal);
- m->interfaces = NULL;
+
+ AVAHI_LLIST_HEAD_INIT(AvahiInterface, m->interfaces);
+ AVAHI_LLIST_HEAD_INIT(AvahiHwInterface, m->hw_interfaces);
if (netlink_list_items(m->netlink, RTM_GETLINK, &m->query_link_seq) < 0)
goto fail;
m->list = LIST_IFACE;
-
+
return m;
fail:
- flx_interface_monitor_free(m);
+ avahi_interface_monitor_free(m);
return NULL;
}
-void flx_interface_monitor_free(flxInterfaceMonitor *m) {
+void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) {
g_assert(m);
+
+ while (m->list != LIST_DONE) {
+ if (!avahi_netlink_work(m->netlink, TRUE))
+ break;
+ }
+}
- if (m->netlink)
- flx_netlink_free(m->netlink);
+void avahi_interface_monitor_free(AvahiInterfaceMonitor *m) {
+ g_assert(m);
+
+ while (m->hw_interfaces)
+ free_hw_interface(m, m->hw_interfaces, TRUE);
+ g_assert(!m->interfaces);
+
+
+ if (m->netlink)
+ avahi_netlink_free(m->netlink);
+
if (m->hash_table)
g_hash_table_destroy(m->hash_table);
}
-flxInterface* flx_interface_monitor_get_interface(flxInterfaceMonitor *m, gint index) {
+AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, gint index, guchar protocol) {
+ AvahiHwInterface *hw;
+ AvahiInterface *i;
+
g_assert(m);
g_assert(index > 0);
+ g_assert(protocol != AF_UNSPEC);
- return g_hash_table_lookup(m->hash_table, &index);
+ if (!(hw = avahi_interface_monitor_get_hw_interface(m, index)))
+ return NULL;
+
+ for (i = hw->interfaces; i; i = i->by_hardware_next)
+ if (i->protocol == protocol)
+ return i;
+
+ return NULL;
}
-flxInterface* flx_interface_monitor_get_first(flxInterfaceMonitor *m) {
+AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint index) {
g_assert(m);
- return m->interfaces;
+ g_assert(index > 0);
+
+ return g_hash_table_lookup(m->hash_table, &index);
}
-int flx_interface_is_relevant(flxInterface *i) {
+
+void avahi_interface_send_packet(AvahiInterface *i, AvahiDnsPacket *p) {
g_assert(i);
+ g_assert(p);
- return
- (i->flags & IFF_UP) &&
- (i->flags & IFF_RUNNING) &&
- !(i->flags & IFF_LOOPBACK);
+ if (avahi_interface_relevant(i)) {
+ g_message("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);
+ else if (i->protocol == AF_INET6 && i->monitor->server->fd_ipv6 >= 0)
+ avahi_send_dns_packet_ipv6(i->monitor->server->fd_ipv6, i->hardware->index, p);
+ }
}
-int flx_address_is_relevant(flxInterfaceAddress *a) {
- g_assert(a);
+void avahi_interface_post_query(AvahiInterface *i, AvahiKey *key, gboolean immediately) {
+ g_assert(i);
+ g_assert(key);
- return
- a->scope == RT_SCOPE_UNIVERSE &&
- flx_interface_is_relevant(a->interface);
+ if (avahi_interface_relevant(i))
+ avahi_packet_scheduler_post_query(i->scheduler, key, immediately);
}
-void flx_interface_send_packet(flxInterface *i, guchar protocol, flxDnsPacket *p) {
+
+void avahi_interface_post_response(AvahiInterface *i, const AvahiAddress *a, AvahiRecord *record, gboolean flush_cache, gboolean immediately) {
g_assert(i);
- g_assert(p);
+ g_assert(record);
- if (!flx_interface_is_relevant(i))
- return;
+ if (avahi_interface_relevant(i))
+ avahi_packet_scheduler_post_response(i->scheduler, a, record, flush_cache, immediately);
+}
+
+void avahi_interface_post_probe(AvahiInterface *i, AvahiRecord *record, gboolean immediately) {
+ g_assert(i);
+ g_assert(record);
- if ((protocol == AF_INET || protocol == AF_UNSPEC) && i->n_ipv4_addrs > 0) {
- g_message("sending on '%s':IPv4", i->name);
- flx_send_dns_packet_ipv4(i->monitor->server->fd_ipv4, i->index, p);
- }
+ if (avahi_interface_relevant(i))
+ avahi_packet_scheduler_post_probe(i->scheduler, record, immediately);
+}
+
+void avahi_dump_caches(AvahiInterfaceMonitor *m, FILE *f) {
+ AvahiInterface *i;
+ g_assert(m);
- if ((protocol == AF_INET6 || protocol == AF_UNSPEC) && i->n_ipv6_addrs > 0) {
- g_message("sending on '%s':IPv6", i->name);
- flx_send_dns_packet_ipv6(i->monitor->server->fd_ipv6, i->index, p);
+ for (i = m->interfaces; i; i = i->interface_next) {
+ if (avahi_interface_relevant(i)) {
+ fprintf(f, "\n;;; INTERFACE %s.%i ;;;\n", i->hardware->name, i->protocol);
+ avahi_cache_dump(i->cache, f);
+ }
}
+ fprintf(f, "\n");
}
-void flx_interface_post_query(flxInterface *i, guchar protocol, flxKey *k) {
+gboolean avahi_interface_relevant(AvahiInterface *i) {
g_assert(i);
- g_assert(k);
- if (!flx_interface_is_relevant(i))
- return;
+ return
+ (i->hardware->flags & IFF_UP) &&
+ (i->hardware->flags & IFF_RUNNING) &&
+ !(i->hardware->flags & IFF_LOOPBACK) &&
+ (i->hardware->flags & IFF_MULTICAST) &&
+ i->addresses;
+}
- if ((protocol == AF_INET || protocol == AF_UNSPEC) && i->n_ipv4_addrs > 0)
- flx_packet_scheduler_post_query(i->ipv4_scheduler, k);
+gboolean avahi_interface_address_relevant(AvahiInterfaceAddress *a) {
+ g_assert(a);
- if ((protocol == AF_INET6 || protocol == AF_UNSPEC) && i->n_ipv6_addrs > 0)
- flx_packet_scheduler_post_query(i->ipv6_scheduler, k);
+ return a->scope == RT_SCOPE_UNIVERSE;
}
-void flx_interface_post_response(flxInterface *i, guchar protocol, flxRecord *rr) {
- g_assert(i);
- g_assert(rr);
- if (!flx_interface_is_relevant(i))
- return;
+gboolean avahi_interface_match(AvahiInterface *i, gint index, guchar protocol) {
+ g_assert(i);
+
+ if (index > 0 && index != i->hardware->index)
+ return FALSE;
- if ((protocol == AF_INET || protocol == AF_UNSPEC) && i->n_ipv4_addrs > 0)
- flx_packet_scheduler_post_response(i->ipv4_scheduler, rr);
+ if (protocol != AF_UNSPEC && protocol != i->protocol)
+ return FALSE;
- if ((protocol == AF_INET6 || protocol == AF_UNSPEC) && i->n_ipv6_addrs > 0)
- flx_packet_scheduler_post_response(i->ipv6_scheduler, rr);
+ return TRUE;
}
-void flx_dump_caches(flxServer *s, FILE *f) {
- flxInterface *i;
- g_assert(s);
- for (i = flx_interface_monitor_get_first(s->monitor); i; i = i->interface_next) {
- if (!flx_interface_is_relevant(i))
- continue;
-
- if (i->n_ipv4_addrs > 0) {
- fprintf(f, ";;; INTERFACE %s; IPv4 ;;;\n", i->name);
- flx_cache_dump(i->ipv4_cache, f);
- }
+void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, gint interface, guchar protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata) {
+ g_assert(m);
+ g_assert(callback);
+
+ if (interface > 0) {
+ if (protocol != AF_UNSPEC) {
+ AvahiInterface *i;
+
+ if ((i = avahi_interface_monitor_get_interface(m, interface, protocol)))
+ callback(m, i, userdata);
+
+ } else {
+ AvahiHwInterface *hw;
+ AvahiInterface *i;
- if (i->n_ipv6_addrs > 0) {
- fprintf(f, ";;; INTERFACE %s; IPv6 ;;;\n", i->name);
- flx_cache_dump(i->ipv6_cache, f);
+ if ((hw = avahi_interface_monitor_get_hw_interface(m, interface)))
+ for (i = hw->interfaces; i; i = i->by_hardware_next)
+ if (avahi_interface_match(i, interface, protocol))
+ callback(m, i, userdata);
}
+
+ } else {
+ AvahiInterface *i;
+
+ for (i = m->interfaces; i; i = i->interface_next)
+ if (avahi_interface_match(i, interface, protocol))
+ callback(m, i, userdata);
}
}