X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-host-name.c;h=f25c4b13fab9b74f357c5d95550072ac6539fb36;hb=80c97b69cc8fb2663296182514d993036e4caaa5;hp=9fbf80345d37cbec3097f6fc3df48a13ef8d6ce9;hpb=22a61b042376903deada022e7585e0585aaa7d43;p=catta diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c index 9fbf803..f25c4b1 100644 --- a/avahi-core/resolve-host-name.c +++ b/avahi-core/resolve-host-name.c @@ -23,134 +23,167 @@ #include #endif -#include "resolve.h" -#include "util.h" +#include +#include +#include -struct AvahiHostNameResolver { +#include "browse.h" +#include "log.h" + +struct AvahiSHostNameResolver { AvahiServer *server; - gchar *host_name; + char *host_name; - AvahiRecordBrowser *record_browser_a; - AvahiRecordBrowser *record_browser_aaaa; + AvahiSRecordBrowser *record_browser_a; + AvahiSRecordBrowser *record_browser_aaaa; - AvahiHostNameResolverCallback callback; - gpointer userdata; + AvahiSHostNameResolverCallback callback; + void* userdata; AvahiTimeEvent *time_event; - AVAHI_LLIST_FIELDS(AvahiHostNameResolver, resolver); + AVAHI_LLIST_FIELDS(AvahiSHostNameResolver, resolver); }; -static void finish(AvahiHostNameResolver *r, gint interface, guchar protocol, AvahiResolverEvent event, AvahiRecord *record) { +static void finish(AvahiSHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, AvahiRecord *record) { AvahiAddress a; - g_assert(r); + assert(r); if (r->record_browser_a) { - avahi_record_browser_free(r->record_browser_a); + avahi_s_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); + avahi_s_record_browser_free(r->record_browser_aaaa); r->record_browser_aaaa = NULL; } - - avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event); - r->time_event = NULL; + + if (r->time_event) { + avahi_time_event_free(r->time_event); + r->time_event = NULL; + } if (record) { switch (record->key->type) { case AVAHI_DNS_TYPE_A: - a.family = AF_INET; + a.family = AVAHI_PROTO_INET; a.data.ipv4 = record->data.a.address; break; case AVAHI_DNS_TYPE_AAAA: - a.family = AF_INET6; + a.family = AVAHI_PROTO_INET6; a.data.ipv6 = record->data.aaaa.address; break; default: - g_assert(FALSE); + assert(0); } } 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, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) { - AvahiHostNameResolver *r = userdata; +static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) { + AvahiSHostNameResolver *r = userdata; - g_assert(rr); - g_assert(record); - g_assert(r); + assert(rr); + assert(record); + assert(r); if (!(event == AVAHI_BROWSER_NEW)) return; - g_assert(record->key->type == AVAHI_DNS_TYPE_A || record->key->type == AVAHI_DNS_TYPE_AAAA); + assert(record->key->type == AVAHI_DNS_TYPE_A || record->key->type == AVAHI_DNS_TYPE_AAAA); finish(r, interface, protocol, AVAHI_RESOLVER_FOUND, record); } static void time_event_callback(AvahiTimeEvent *e, void *userdata) { - AvahiHostNameResolver *r = userdata; + AvahiSHostNameResolver *r = userdata; - g_assert(e); - g_assert(r); + assert(e); + assert(r); - finish(r, -1, AF_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL); + finish(r, -1, AVAHI_PROTO_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL); } -AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint interface, guchar protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) { - AvahiHostNameResolver *r; +AvahiSHostNameResolver *avahi_s_host_name_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const char *host_name, AvahiProtocol aprotocol, AvahiSHostNameResolverCallback callback, void* userdata) { + AvahiSHostNameResolver *r; AvahiKey *k; - GTimeVal tv; + struct timeval tv; - g_assert(server); - g_assert(host_name); - g_assert(callback); + assert(server); + assert(host_name); + assert(callback); - g_assert(aprotocol == AF_UNSPEC || aprotocol == AF_INET || aprotocol == AF_INET6); + assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6); - r = g_new(AvahiHostNameResolver, 1); + if (!avahi_is_valid_domain_name(host_name)) { + avahi_server_set_errno(server, AVAHI_ERR_INVALID_HOST_NAME); + return NULL; + } + + if (!(r = avahi_new(AvahiSHostNameResolver, 1))) { + avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY); + return NULL; + } + r->server = server; r->host_name = avahi_normalize_name(host_name); r->callback = callback; r->userdata = userdata; - if (aprotocol == AF_INET || aprotocol == AF_UNSPEC) { + r->record_browser_a = r->record_browser_aaaa = NULL; + + avahi_elapse_time(&tv, 1000, 0); + r->time_event = avahi_time_event_new(server->time_event_queue, &tv, time_event_callback, r); + + AVAHI_LLIST_PREPEND(AvahiSHostNameResolver, resolver, server->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); + r->record_browser_a = avahi_s_record_browser_new(server, interface, protocol, k, record_browser_callback, r); avahi_key_unref(k); - } else - r->record_browser_a = NULL; - if (aprotocol == AF_INET6 || aprotocol == AF_UNSPEC) { + 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); + r->record_browser_aaaa = avahi_s_record_browser_new(server, interface, protocol, k, record_browser_callback, r); avahi_key_unref(k); - } else - 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); - - AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r); - + if (!r->record_browser_aaaa) + goto fail; + } + + assert(r->record_browser_aaaa || r->record_browser_a); + return r; + +fail: + avahi_s_host_name_resolver_free(r); + return NULL; } -void avahi_host_name_resolver_free(AvahiHostNameResolver *r) { - g_assert(r); +void avahi_s_host_name_resolver_free(AvahiSHostNameResolver *r) { + assert(r); - AVAHI_LLIST_REMOVE(AvahiHostNameResolver, resolver, r->server->host_name_resolvers, r); + AVAHI_LLIST_REMOVE(AvahiSHostNameResolver, resolver, r->server->host_name_resolvers, r); if (r->record_browser_a) - avahi_record_browser_free(r->record_browser_a); + avahi_s_record_browser_free(r->record_browser_a); + if (r->record_browser_aaaa) - avahi_record_browser_free(r->record_browser_aaaa); + avahi_s_record_browser_free(r->record_browser_aaaa); + + if (r->time_event) + avahi_time_event_free(r->time_event); - g_free(r->host_name); - g_free(r); + avahi_free(r->host_name); + avahi_free(r); }