#include <config.h>
#endif
+#include <avahi-common/timeval.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+
#include "browse.h"
-#include "timeval.h"
-struct AvahiAddressResolver {
+#define TIMEOUT_MSEC 1000
+
+struct AvahiSAddressResolver {
AvahiServer *server;
AvahiAddress address;
- AvahiRecordBrowser *record_browser;
+ AvahiSRecordBrowser *record_browser;
+
+ AvahiSAddressResolverCallback callback;
+ void* userdata;
- AvahiAddressResolverCallback callback;
- gpointer userdata;
+ AvahiRecord *ptr_record;
+ AvahiIfIndex interface;
+ AvahiProtocol protocol;
AvahiTimeEvent *time_event;
- AVAHI_LLIST_FIELDS(AvahiAddressResolver, resolver);
+ AVAHI_LLIST_FIELDS(AvahiSAddressResolver, resolver);
};
-static void finish(AvahiAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, AvahiRecord *record) {
- g_assert(r);
+static void finish(AvahiSAddressResolver *r, AvahiResolverEvent event) {
+ assert(r);
- avahi_record_browser_free(r->record_browser);
- r->record_browser = NULL;
-
if (r->time_event) {
- avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+ avahi_time_event_free(r->time_event);
r->time_event = NULL;
}
- r->callback(r, interface, protocol, event, &r->address, record ? record->data.ptr.name : NULL, r->userdata);
-}
-
-static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
- AvahiAddressResolver *r = userdata;
-
- g_assert(rr);
- g_assert(record);
- g_assert(r);
-
- if (!(event == AVAHI_BROWSER_NEW))
- return;
+ if (event == AVAHI_RESOLVER_TIMEOUT)
+ r->callback(r, r->interface, r->protocol, AVAHI_RESOLVER_TIMEOUT, &r->address, NULL, r->userdata);
+ else {
- g_assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+ assert(event == AVAHI_RESOLVER_FOUND);
+ assert(r->ptr_record);
- finish(r, interface, protocol, AVAHI_RESOLVER_FOUND, record);
+ r->callback(r, r->interface, r->protocol, AVAHI_RESOLVER_FOUND, &r->address, r->ptr_record->data.ptr.name, r->userdata);
+ }
}
static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
- AvahiAddressResolver *r = userdata;
+ AvahiSAddressResolver *r = userdata;
- g_assert(e);
- g_assert(r);
+ assert(e);
+ assert(r);
- finish(r, -1, AVAHI_PROTO_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
+ finish(r, AVAHI_RESOLVER_TIMEOUT);
}
-AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const AvahiAddress *address, AvahiAddressResolverCallback callback, gpointer userdata) {
- AvahiAddressResolver *r;
- AvahiKey *k;
- gchar *n;
+static void start_timeout(AvahiSAddressResolver *r) {
struct timeval tv;
+ assert(r);
- g_assert(server);
- g_assert(address);
- g_assert(callback);
+ if (r->time_event)
+ return;
- g_assert(address->family == AVAHI_PROTO_INET || address->family == AVAHI_PROTO_INET6);
+ avahi_elapse_time(&tv, TIMEOUT_MSEC, 0);
+ r->time_event = avahi_time_event_new(r->server->time_event_queue, &tv, time_event_callback, r);
+}
- r = g_new(AvahiAddressResolver, 1);
- r->server = server;
- r->address = *address;
- r->callback = callback;
- r->userdata = userdata;
+static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) {
+ AvahiSAddressResolver *r = userdata;
+
+ assert(rr);
+ assert(record);
+ assert(r);
+
+ assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+
+ if (event == AVAHI_BROWSER_NEW) {
+
+ if (r->interface > 0 && interface != r->interface)
+ return;
+
+ if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
+ return;
+
+ if (r->interface <= 0)
+ r->interface = interface;
+
+ if (r->protocol == AVAHI_PROTO_UNSPEC)
+ r->protocol = protocol;
+
+ if (!r->ptr_record) {
+ r->ptr_record = avahi_record_ref(record);
+
+ finish(r, AVAHI_RESOLVER_FOUND);
+ }
+
+ } else {
+
+ assert(event == AVAHI_BROWSER_REMOVE);
+
+ if (r->ptr_record && avahi_record_equal_no_ttl(record, r->ptr_record)) {
+ avahi_record_unref(r->ptr_record);
+ r->ptr_record = NULL;
+
+ /** Look for a replacement */
+ avahi_s_record_browser_restart(r->record_browser);
+ start_timeout(r);
+ }
+ }
+}
- avahi_elapse_time(&tv, 1000, 0);
- r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
+AvahiSAddressResolver *avahi_s_address_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const AvahiAddress *address, AvahiSAddressResolverCallback callback, void* userdata) {
+ AvahiSAddressResolver *r;
+ AvahiKey *k;
+ char *n;
+
+ assert(server);
+ assert(address);
+ assert(callback);
+
+ assert(address->family == AVAHI_PROTO_INET || address->family == AVAHI_PROTO_INET6);
- AVAHI_LLIST_PREPEND(AvahiAddressResolver, resolver, server->address_resolvers, r);
-
if (address->family == AVAHI_PROTO_INET)
n = avahi_reverse_lookup_name_ipv4(&address->data.ipv4);
else
n = avahi_reverse_lookup_name_ipv6_arpa(&address->data.ipv6);
-
+
+ if (!n) {
+ avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+ return NULL;
+ }
+
k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
- g_free(n);
+ avahi_free(n);
+
+ if (!k) {
+ avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+ return NULL;
+ }
+
+ if (!(r = avahi_new(AvahiSAddressResolver, 1))) {
+ avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+ avahi_key_unref(k);
+ return NULL;
+ }
- r->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
+ r->server = server;
+ r->address = *address;
+ r->callback = callback;
+ r->userdata = userdata;
+ r->ptr_record = NULL;
+ r->interface = interface;
+ r->protocol = protocol;
+
+ r->record_browser = NULL;
+ AVAHI_LLIST_PREPEND(AvahiSAddressResolver, resolver, server->address_resolvers, r);
+
+ r->time_event = NULL;
+ start_timeout(r);
+
+ r->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
avahi_key_unref(k);
if (!r->record_browser) {
- avahi_address_resolver_free(r);
+ avahi_s_address_resolver_free(r);
return NULL;
}
return r;
}
-void avahi_address_resolver_free(AvahiAddressResolver *r) {
- g_assert(r);
+void avahi_s_address_resolver_free(AvahiSAddressResolver *r) {
+ assert(r);
- AVAHI_LLIST_REMOVE(AvahiAddressResolver, resolver, r->server->address_resolvers, r);
+ AVAHI_LLIST_REMOVE(AvahiSAddressResolver, resolver, r->server->address_resolvers, r);
if (r->record_browser)
- avahi_record_browser_free(r->record_browser);
+ avahi_s_record_browser_free(r->record_browser);
if (r->time_event)
- avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+ avahi_time_event_free(r->time_event);
+
+ if (r->ptr_record)
+ avahi_record_unref(r->ptr_record);
- g_free(r);
+ avahi_free(r);
}
projects / catta / blobdiff