From d1dd07145bb3db5c6fd77c55aea762eb79ab3b5c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 10 Oct 2005 22:34:06 +0000 Subject: * rename avahi_service_name_snprint() to avahi_service_name_join() * add avahi_service_name_split() and make everything use it * change avahi_normalize_name() to work on a supplied buffer instead of malloc'ed memory. * add avahi_normalize_name_strdup() that retains the old behaviour avahi_normalize_name() * same thing for avahi_get_host_name()/avahi_get_host_name_strdup() * Rewrite domain name escaping and validity checking code * Remove superfluous memory allocationsfrom various browsers and do some other major cleanups * add new global macro AVAHI_CHECK_VALIDITY_RETURN_NULL() and modify many things to make use of it * add AVAHI_LABEL_MAX * patch everything to make use of AVAHI_LABEL_MAX and AVAHI_DOMAIN_NAME_MAX * add pretty printing for NS records * add partial pretty printing for SOA records * add many more validity checks to various user API functions git-svn-id: file:///home/lennart/svn/public/avahi/trunk@708 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/browse-domain.c | 94 ++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 57 deletions(-) (limited to 'avahi-core/browse-domain.c') diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c index 2cb2f75..e2eab44 100644 --- a/avahi-core/browse-domain.c +++ b/avahi-core/browse-domain.c @@ -31,10 +31,8 @@ struct AvahiSDomainBrowser { AvahiServer *server; - char *domain_name; AvahiSRecordBrowser *record_browser; - AvahiLookupResultFlags flags; AvahiSDomainBrowserCallback callback; void* userdata; @@ -59,13 +57,13 @@ static void record_browser_callback( if (record) { assert(record->key->type == AVAHI_DNS_TYPE_PTR); - n = avahi_normalize_name(record->data.ptr.name); + n = record->data.ptr.name; } b->callback(b, interface, protocol, event, n, flags, b->userdata); - avahi_free(n); } + AvahiSDomainBrowser *avahi_s_domain_browser_new( AvahiServer *server, AvahiIfIndex interface, @@ -75,34 +73,34 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( AvahiLookupFlags flags, AvahiSDomainBrowserCallback callback, void* userdata) { + + static const char * const type_table[AVAHI_DOMAIN_BROWSER_MAX] = { + "r", + "dr", + "b", + "db", + "lb" + }; AvahiSDomainBrowser *b; - AvahiKey *k; - char *n = NULL; + AvahiKey *k = NULL; + char n[AVAHI_DOMAIN_NAME_MAX]; + int r; assert(server); assert(callback); - if (type >= AVAHI_DOMAIN_BROWSER_MAX) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS); - return NULL; - } - - if (!AVAHI_IF_VALID(interface)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_INTERFACE); - return NULL; - } - - if (domain && !avahi_is_valid_domain_name(domain)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME); - return NULL; - } + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_IF_VALID(interface), AVAHI_ERR_INVALID_INTERFACE); + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL); + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, type < AVAHI_DOMAIN_BROWSER_MAX, AVAHI_ERR_INVALID_FLAGS); + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME); + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS); if (!domain) domain = server->domain_name; - - if (!AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS); + + if ((r = avahi_service_name_join(n, sizeof(n), type_table[type], "_dns-sd._udp", domain)) < 0) { + avahi_server_set_errno(server, r); return NULL; } @@ -112,48 +110,31 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( } b->server = server; - b->domain_name = avahi_normalize_name(domain); b->callback = callback; b->userdata = userdata; + b->record_browser = NULL; AVAHI_LLIST_PREPEND(AvahiSDomainBrowser, browser, server->domain_browsers, b); - switch (type) { - case AVAHI_DOMAIN_BROWSER_BROWSE: - n = avahi_strdup_printf("b._dns-sd._udp.%s", b->domain_name); - break; - case AVAHI_DOMAIN_BROWSER_BROWSE_DEFAULT: - n = avahi_strdup_printf("db._dns-sd._udp.%s", b->domain_name); - break; - case AVAHI_DOMAIN_BROWSER_REGISTER: - n = avahi_strdup_printf("r._dns-sd._udp.%s", b->domain_name); - break; - case AVAHI_DOMAIN_BROWSER_REGISTER_DEFAULT: - n = avahi_strdup_printf("dr._dns-sd._udp.%s", b->domain_name); - break; - case AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY: - n = avahi_strdup_printf("lb._dns-sd._udp.%s", b->domain_name); - break; - - case AVAHI_DOMAIN_BROWSER_MAX: - assert(0); - break; + if (!(k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR))) { + avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY); + goto fail; } - - assert(n); - - k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR); - avahi_free(n); - b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b); - avahi_key_unref(k); - - if (!b->record_browser) { - avahi_s_domain_browser_free(b); - return NULL; - } + if (!(b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b))) + goto fail; + avahi_key_unref(k); return b; + +fail: + + if (k) + avahi_key_unref(k); + + avahi_s_domain_browser_free(b); + + return NULL; } void avahi_s_domain_browser_free(AvahiSDomainBrowser *b) { @@ -164,6 +145,5 @@ void avahi_s_domain_browser_free(AvahiSDomainBrowser *b) { if (b->record_browser) avahi_s_record_browser_free(b->record_browser); - avahi_free(b->domain_name); avahi_free(b); } -- cgit