#include <config.h>
#endif
-#include "resolve.h"
+#include "browse.h"
#include "util.h"
struct AvahiHostNameResolver {
AvahiServer *server;
gchar *host_name;
- AvahiRecordResolver *record_resolver_a;
- AvahiRecordResolver *record_resolver_aaaa;
+ AvahiRecordBrowser *record_browser_a;
+ AvahiRecordBrowser *record_browser_aaaa;
AvahiHostNameResolverCallback callback;
gpointer userdata;
+ AvahiTimeEvent *time_event;
+
AVAHI_LLIST_FIELDS(AvahiHostNameResolver, resolver);
};
-static void record_resolver_callback(AvahiRecordResolver*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
- AvahiHostNameResolver *r = userdata;
+static void finish(AvahiHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, AvahiRecord *record) {
AvahiAddress a;
+
+ g_assert(r);
+
+ if (r->record_browser_a) {
+ avahi_record_browser_free(r->record_browser_a);
+ r->record_browser_a = NULL;
+ }
+
+ if (r->record_browser_aaaa) {
+ avahi_record_browser_free(r->record_browser_aaaa);
+ r->record_browser_aaaa = NULL;
+ }
+
+ if (r->time_event) {
+ avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+ r->time_event = NULL;
+ }
+
+ if (record) {
+ switch (record->key->type) {
+ case AVAHI_DNS_TYPE_A:
+ a.family = AVAHI_PROTO_INET;
+ a.data.ipv4 = record->data.a.address;
+ break;
+
+ case AVAHI_DNS_TYPE_AAAA:
+ a.family = AVAHI_PROTO_INET6;
+ a.data.ipv6 = record->data.aaaa.address;
+ break;
+
+ default:
+ g_assert(FALSE);
+ }
+ }
+
+ r->callback(r, interface, protocol, event, record ? record->key->name : r->host_name, record ? &a : NULL, r->userdata);
+}
+
+static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
+ AvahiHostNameResolver *r = userdata;
g_assert(rr);
g_assert(record);
g_assert(r);
- switch (record->key->type) {
- case AVAHI_DNS_TYPE_A:
- a.family = AF_INET;
- a.data.ipv4 = record->data.a.address;
- break;
-
- case AVAHI_DNS_TYPE_AAAA:
- a.family = AF_INET6;
- a.data.ipv6 = record->data.aaaa.address;
- break;
+ if (!(event == AVAHI_BROWSER_NEW))
+ return;
+
+ g_assert(record->key->type == AVAHI_DNS_TYPE_A || record->key->type == AVAHI_DNS_TYPE_AAAA);
+ finish(r, interface, protocol, AVAHI_RESOLVER_FOUND, record);
+}
- default:
- g_assert(FALSE);
- }
+static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
+ AvahiHostNameResolver *r = userdata;
+
+ g_assert(e);
+ g_assert(r);
- r->callback(r, interface, protocol, event, record->key->name, &a, r->userdata);
+ finish(r, -1, AVAHI_PROTO_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
}
-AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *s, gint interface, guchar protocol, const gchar *host_name, AvahiHostNameResolverCallback callback, gpointer userdata) {
+AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) {
AvahiHostNameResolver *r;
AvahiKey *k;
-
- g_assert(s);
+ GTimeVal tv;
+
+ g_assert(server);
g_assert(host_name);
g_assert(callback);
+ g_assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
+
+ if (!avahi_valid_domain_name(host_name)) {
+ avahi_server_set_errno(server, AVAHI_ERR_INVALID_HOST_NAME);
+ return NULL;
+ }
+
r = g_new(AvahiHostNameResolver, 1);
- r->server = s;
+ r->server = server;
r->host_name = avahi_normalize_name(host_name);
r->callback = callback;
r->userdata = userdata;
- k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
- r->record_resolver_a = avahi_record_resolver_new(s, interface, protocol, k, record_resolver_callback, r);
- avahi_key_unref(k);
+ r->record_browser_a = r->record_browser_aaaa = NULL;
+
+ avahi_elapse_time(&tv, 1000, 0);
+ r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
- k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
- r->record_resolver_aaaa = avahi_record_resolver_new(s, interface, protocol, k, record_resolver_callback, r);
- avahi_key_unref(k);
+ AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
- AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, s->host_name_resolvers, r);
+ r->record_browser_aaaa = r->record_browser_a = NULL;
+ if (aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_UNSPEC) {
+ k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
+ r->record_browser_a = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
+ avahi_key_unref(k);
+
+ if (!r->record_browser_a)
+ goto fail;
+ }
+
+ if (aprotocol == AVAHI_PROTO_INET6 || aprotocol == AVAHI_PROTO_UNSPEC) {
+ k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
+ r->record_browser_aaaa = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
+ avahi_key_unref(k);
+
+ if (!r->record_browser_aaaa)
+ goto fail;
+ }
+
+ g_assert(r->record_browser_aaaa || r->record_browser_a);
+
return r;
+
+fail:
+ avahi_host_name_resolver_free(r);
+ return NULL;
}
void avahi_host_name_resolver_free(AvahiHostNameResolver *r) {
AVAHI_LLIST_REMOVE(AvahiHostNameResolver, resolver, r->server->host_name_resolvers, r);
- avahi_record_resolver_free(r->record_resolver_a);
- avahi_record_resolver_free(r->record_resolver_aaaa);
+ if (r->record_browser_a)
+ avahi_record_browser_free(r->record_browser_a);
+
+ if (r->record_browser_aaaa)
+ avahi_record_browser_free(r->record_browser_aaaa);
+
+ if (r->time_event)
+ avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+
g_free(r->host_name);
g_free(r);
}
projects / catta / blobdiff