#include <string.h>
#include <sys/socket.h>
-#include <asm/types.h>
#include <errno.h>
#include <stdio.h>
+#include <stdlib.h>
#include <avahi-common/error.h>
#include <avahi-common/malloc.h>
return;
if (avahi_s_entry_group_is_empty(a->entry_group)) {
- char t[64];
+ char t[AVAHI_ADDRESS_STR_MAX];
avahi_address_snprint(t, sizeof(t), &a->address);
avahi_log_info("Registering new address %s on %s.", t, a->interface->hardware->name);
/* Clear the entry group */
if (a->entry_group && !avahi_s_entry_group_is_empty(a->entry_group)) {
- char t[64];
+ char t[AVAHI_ADDRESS_STR_MAX];
avahi_address_snprint(t, sizeof(t), &a->address);
if (avahi_s_entry_group_get_state(a->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING &&
assert(i);
/* Handle goodbyes and remove announcers */
- avahi_goodbye_interface(i->monitor->server, i, send_goodbye);
+ avahi_goodbye_interface(i->monitor->server, i, send_goodbye, 1);
avahi_response_scheduler_force(i->response_scheduler);
- assert(!i->announcements);
+ assert(!i->announcers);
/* Remove queriers */
avahi_querier_free_all(i);
i->announcing = 0;
AVAHI_LLIST_HEAD_INIT(AvahiInterfaceAddress, i->addresses);
- AVAHI_LLIST_HEAD_INIT(AvahiAnnouncement, i->announcements);
+ AVAHI_LLIST_HEAD_INIT(AvahiAnnouncer, i->announcers);
AVAHI_LLIST_HEAD_INIT(AvahiQuerier, i->queriers);
i->queriers_by_key = avahi_hashmap_new((AvahiHashFunc) avahi_key_hash, (AvahiEqualFunc) avahi_key_equal, NULL, NULL);
return a;
}
+static int interface_mdns_mcast_join(AvahiInterface *i, int join) {
+
+ if (i->protocol == AVAHI_PROTO_INET6)
+ return avahi_mdns_mcast_join_ipv6(i->monitor->server->fd_ipv6, i->hardware->index, join);
+ else if (i->protocol == AVAHI_PROTO_INET) {
+
+#ifdef HAVE_STRUCT_IP_MREQN
+ return avahi_mdns_mcast_join_ipv4(i->monitor->server->fd_ipv4, i->hardware->index, join);
+
+#else
+ AvahiInterfaceAddress *ia;
+ int r = 0;
+
+ for (ia = i->addresses; ia; ia = ia->address_next)
+ r |= avahi_mdns_mcast_join_ipv4(i->monitor->server->fd_ipv4, &ia->address, join);
+
+ return r;
+#endif
+ }
+
+ abort();
+}
+
+
void avahi_interface_check_relevant(AvahiInterface *i) {
int b;
AvahiInterfaceMonitor *m;
if (m->list_complete && b && !i->announcing) {
avahi_log_info("New relevant interface %s.%s.", i->hardware->name, avahi_proto_to_string(i->protocol));
- if (i->protocol == AVAHI_PROTO_INET)
- avahi_mdns_mcast_join_ipv4(m->server->fd_ipv4, i->hardware->index);
- if (i->protocol == AVAHI_PROTO_INET6)
- avahi_mdns_mcast_join_ipv6(m->server->fd_ipv6, i->hardware->index);
+ interface_mdns_mcast_join(i, 1);
i->announcing = 1;
avahi_announce_interface(m->server, i);
} else if (!b && i->announcing) {
avahi_log_info("Interface %s.%s no longer relevant.", i->hardware->name, avahi_proto_to_string(i->protocol));
- if (i->protocol == AVAHI_PROTO_INET)
- avahi_mdns_mcast_leave_ipv4(m->server->fd_ipv4, i->hardware->index);
- if (i->protocol == AVAHI_PROTO_INET6)
- avahi_mdns_mcast_leave_ipv6(m->server->fd_ipv6, i->hardware->index);
+ interface_mdns_mcast_join(i, 0);
- avahi_goodbye_interface(m->server, i, 0);
+ avahi_goodbye_interface(m->server, i, 0, 1);
avahi_querier_free_all(i);
avahi_response_scheduler_clear(i->response_scheduler);
void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, uint16_t port) {
assert(i);
assert(p);
-/* char t[64]; */
+/* char t[AVAHI_ADDRESS_STR_MAX]; */
if (!avahi_interface_is_relevant(i))
return;