#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <avahi-common/error.h>
#include <avahi-common/malloc.h>
assert(a);
m = a->monitor;
- if (a->interface->announcing &&
- m->list_complete &&
+ if (m->list_complete &&
avahi_interface_address_is_relevant(a) &&
+ avahi_interface_is_relevant(a->interface) &&
!remove_rrs &&
m->server->config.publish_addresses &&
(m->server->state == AVAHI_SERVER_RUNNING ||
if (avahi_s_entry_group_is_empty(a->entry_group)) {
char t[AVAHI_ADDRESS_STR_MAX];
- avahi_address_snprint(t, sizeof(t), &a->address);
+ AvahiProtocol p;
- avahi_log_info("Registering new address %s on %s.", t, a->interface->hardware->name);
+ p = (a->interface->protocol == AVAHI_PROTO_INET && m->server->config.publish_a_on_ipv6) ||
+ (a->interface->protocol == AVAHI_PROTO_INET6 && m->server->config.publish_aaaa_on_ipv4) ? AVAHI_PROTO_UNSPEC : a->interface->protocol;
+
+ avahi_address_snprint(t, sizeof(t), &a->address);
+ avahi_log_info("Registering new address record for %s on %s.%s.", t, a->interface->hardware->name, p == AVAHI_PROTO_UNSPEC ? "*" : avahi_proto_to_string(p));
- if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, a->interface->protocol, 0, NULL, &a->address) < 0) {
+ if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, p, 0, NULL, &a->address) < 0) {
avahi_log_warn(__FILE__": avahi_server_add_address() failed: %s", avahi_strerror(m->server->error));
avahi_s_entry_group_free(a->entry_group);
a->entry_group = NULL;
m->server->state == AVAHI_SERVER_REGISTERING)
avahi_server_decrease_host_rr_pending(m->server);
- avahi_log_info("Withdrawing address %s on %s.", t, a->interface->hardware->name);
+ avahi_log_info("Withdrawing address record for %s on %s.", t, a->interface->hardware->name);
avahi_s_entry_group_reset(a->entry_group);
}
if (m->list_complete &&
!remove_rrs &&
m->server->config.publish_workstation &&
- (m->server->state == AVAHI_SERVER_RUNNING ||
- m->server->state == AVAHI_SERVER_REGISTERING)) {
+ (m->server->state == AVAHI_SERVER_RUNNING)) {
if (!hw->entry_group)
hw->entry_group = avahi_s_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL);
return; /* OOM */
if (avahi_s_entry_group_is_empty(hw->entry_group)) {
- char name[AVAHI_LABEL_MAX];
- char *t;
+ char name[AVAHI_LABEL_MAX], mac[256];
- if (!(t = avahi_format_mac_address(hw->mac_address, hw->mac_address_size)))
- return; /* OOM */
+ avahi_format_mac_address(mac, sizeof(mac), hw->mac_address, hw->mac_address_size);
+ snprintf(name, sizeof(name), "%s [%s]", m->server->host_name, mac);
- snprintf(name, sizeof(name), "%s [%s]", m->server->host_name, t);
- avahi_free(t);
-
- if (!name)
- return; /* OOM */
-
if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AVAHI_PROTO_UNSPEC, 0, name, "_workstation._tcp", NULL, NULL, 9, NULL) < 0) {
avahi_log_warn(__FILE__": avahi_server_add_service() failed: %s", avahi_strerror(m->server->error));
avahi_s_entry_group_free(hw->entry_group);
static int interface_mdns_mcast_join(AvahiInterface *i, int join) {
char at[AVAHI_ADDRESS_STR_MAX];
+ int r;
assert(i);
- assert((join && !i->mcast_joined) || (!join && i->mcast_joined));
+ if (!!join == !!i->mcast_joined)
+ return 0;
+
+ if ((i->protocol == AVAHI_PROTO_INET6 && i->monitor->server->fd_ipv6 < 0) ||
+ (i->protocol == AVAHI_PROTO_INET && i->monitor->server->fd_ipv4 < 0))
+ return -1;
if (join) {
AvahiInterfaceAddress *a;
a = i->addresses;
/* Hmm, there is no address available. */
- if (!a) {
- avahi_log_warn(__FILE__": interface_mdns_mcast_join() called but no local address available.");
+ if (!a)
return -1;
- }
i->local_mcast_address = a->address;
}
- avahi_log_info("%s mDNS multicast group on interface %s.%s with address %s",
+ avahi_log_info("%s mDNS multicast group on interface %s.%s with address %s.",
join ? "Joining" : "Leaving",
i->hardware->name,
avahi_proto_to_string(i->protocol),
avahi_address_snprint(at, sizeof(at), &i->local_mcast_address));
- if (i->protocol == AVAHI_PROTO_INET6) {
- if (avahi_mdns_mcast_join_ipv6(i->monitor->server->fd_ipv6, &i->local_mcast_address.data.ipv6, i->hardware->index, join) < 0)
- return -1;
-
- } else {
+ if (i->protocol == AVAHI_PROTO_INET6)
+ r = avahi_mdns_mcast_join_ipv6(i->monitor->server->fd_ipv6, &i->local_mcast_address.data.ipv6, i->hardware->index, join);
+ else {
assert(i->protocol == AVAHI_PROTO_INET);
- if (avahi_mdns_mcast_join_ipv4(i->monitor->server->fd_ipv4, &i->local_mcast_address.data.ipv4, i->hardware->index, join) < 0)
- return -1;
+ r = avahi_mdns_mcast_join_ipv4(i->monitor->server->fd_ipv4, &i->local_mcast_address.data.ipv4, i->hardware->index, join);
}
- i->mcast_joined = join;
+ if (r < 0)
+ i->mcast_joined = 0;
+ else
+ i->mcast_joined = join;
+
return 0;
}
avahi_hashmap_insert(m->hashmap, &hw->index, hw);
- if (m->server->fd_ipv4 >= 0)
+ if (m->server->fd_ipv4 >= 0 || m->server->config.publish_a_on_ipv6)
avahi_interface_new(m, hw, AVAHI_PROTO_INET);
- if (m->server->fd_ipv6 >= 0)
+ if (m->server->fd_ipv6 >= 0 || m->server->config.publish_aaaa_on_ipv4)
avahi_interface_new(m, hw, AVAHI_PROTO_INET6);
return hw;
b = avahi_interface_is_relevant(i);
if (m->list_complete && b && !i->announcing) {
- avahi_log_info("New relevant interface %s.%s.", i->hardware->name, avahi_proto_to_string(i->protocol));
-
interface_mdns_mcast_join(i, 1);
- i->announcing = 1;
- avahi_announce_interface(m->server, i);
- avahi_multicast_lookup_engine_new_interface(m->server->multicast_lookup_engine, i);
+ if (i->mcast_joined) {
+ avahi_log_info("New relevant interface %s.%s for mDNS.", i->hardware->name, avahi_proto_to_string(i->protocol));
+
+ i->announcing = 1;
+ avahi_announce_interface(m->server, i);
+ avahi_multicast_lookup_engine_new_interface(m->server->multicast_lookup_engine, i);
+ }
+
} else if (!b && i->announcing) {
- avahi_log_info("Interface %s.%s no longer relevant.", i->hardware->name, avahi_proto_to_string(i->protocol));
+ avahi_log_info("Interface %s.%s no longer relevant for mDNS.", i->hardware->name, avahi_proto_to_string(i->protocol));
interface_mdns_mcast_join(i, 0);
AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, AvahiIfIndex idx) {
assert(m);
- assert(idx > 0);
+ assert(idx >= 0);
return avahi_hashmap_lookup(m->hashmap, &idx);
}
return NULL;
}
-
void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, uint16_t port) {
assert(i);
assert(p);
-/* char t[AVAHI_ADDRESS_STR_MAX]; */
- if (!avahi_interface_is_relevant(i))
+ if (!i->announcing)
return;
assert(!a || a->proto == i->protocol);
-/* if (a) */
-/* 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 */
-/* avahi_log_debug("multicast sending on '%s.%i'", i->hardware->name, i->protocol); */
-
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);
+ avahi_send_dns_packet_ipv4(i->monitor->server->fd_ipv4, i->hardware->index, p, i->mcast_joined ? &i->local_mcast_address.data.ipv4 : NULL, a ? &a->data.ipv4 : NULL, port);
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);
+ avahi_send_dns_packet_ipv6(i->monitor->server->fd_ipv6, i->hardware->index, p, i->mcast_joined ? &i->local_mcast_address.data.ipv6 : NULL, a ? &a->data.ipv6 : NULL, port);
}
void avahi_interface_send_packet(AvahiInterface *i, AvahiDnsPacket *p) {
avahi_interface_send_packet_unicast(i, p, NULL, 0);
}
-int avahi_interface_post_query(AvahiInterface *i, AvahiKey *key, int immediately) {
+int avahi_interface_post_query(AvahiInterface *i, AvahiKey *key, int immediately, unsigned *ret_id) {
assert(i);
assert(key);
- if (avahi_interface_is_relevant(i))
- return avahi_query_scheduler_post(i->query_scheduler, key, immediately);
+ if (!i->announcing)
+ return 0;
+
+ return avahi_query_scheduler_post(i->query_scheduler, key, immediately, ret_id);
+}
+
+int avahi_interface_withraw_query(AvahiInterface *i, unsigned id) {
- return 0;
+ return avahi_query_scheduler_withdraw_by_id(i->query_scheduler, id);
}
int avahi_interface_post_response(AvahiInterface *i, AvahiRecord *record, int flush_cache, const AvahiAddress *querier, int immediately) {
assert(i);
assert(record);
- if (avahi_interface_is_relevant(i))
- return avahi_response_scheduler_post(i->response_scheduler, record, flush_cache, querier, immediately);
-
- return 0;
+ if (!i->announcing)
+ return 0;
+
+ return avahi_response_scheduler_post(i->response_scheduler, record, flush_cache, querier, immediately);
}
int avahi_interface_post_probe(AvahiInterface *i, AvahiRecord *record, int immediately) {
assert(i);
assert(record);
- if (avahi_interface_is_relevant(i))
- return avahi_probe_scheduler_post(i->probe_scheduler, record, immediately);
+ if (!i->announcing)
+ return 0;
- return 0;
+ return avahi_probe_scheduler_post(i->probe_scheduler, record, immediately);
}
int avahi_dump_caches(AvahiInterfaceMonitor *m, AvahiDumpCallback callback, void* userdata) {
int avahi_interface_is_relevant(AvahiInterface *i) {
AvahiInterfaceAddress *a;
- int relevant_address;
assert(i);
- relevant_address = 0;
+ if (!i->hardware->flags_ok)
+ return 0;
for (a = i->addresses; a; a = a->address_next)
- if (avahi_interface_address_is_relevant(a)) {
- relevant_address = 1;
- break;
- }
+ if (avahi_interface_address_is_relevant(a))
+ return 1;
- return i->hardware->flags_ok && relevant_address;
+ return 0;
}
-
+
int avahi_interface_address_is_relevant(AvahiInterfaceAddress *a) {
AvahiInterfaceAddress *b;
assert(a);
return 0;
}
+
+AvahiIfIndex avahi_find_interface_for_address(AvahiInterfaceMonitor *m, const AvahiAddress *a) {
+ AvahiInterface *i;
+ assert(m);
+
+ /* Some stupid OS don't support passing the interface index when a
+ * packet is recieved. We have to work around that limitation by
+ * looking for an interface that has the incoming address
+ * attached. This is sometimes ambiguous, but we have to live with
+ * it. */
+
+ for (i = m->interfaces; i; i = i->interface_next) {
+ AvahiInterfaceAddress *ai;
+
+ if (i->protocol != a->proto)
+ continue;
+
+ for (ai = i->addresses; ai; ai = ai->address_next)
+ if (avahi_address_cmp(a, &ai->address) == 0)
+ return i->hardware->index;
+ }
+
+ return AVAHI_IF_UNSPEC;
+}
projects / catta / blobdiff