X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fbrowse-service.c;h=dde36bc74048775dca2a08fc934a9cc3d2f9338d;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=34a2536f47903870fcc2ecc3e7ddc01b1f84f133;hpb=0632e854728e8e64552ae08f90852d4a2658539e;p=catta diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c index 34a2536..dde36bc 100644 --- a/avahi-core/browse-service.c +++ b/avahi-core/browse-service.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -25,117 +23,145 @@ #include +#include +#include +#include + #include "browse.h" -#include "util.h" #include "log.h" -struct AvahiServiceBrowser { +struct AvahiSServiceBrowser { AvahiServer *server; - gchar *domain_name; - gchar *service_type; - - AvahiRecordBrowser *record_browser; + char *domain_name; + char *service_type; + + AvahiSRecordBrowser *record_browser; - AvahiServiceBrowserCallback callback; - gpointer userdata; + AvahiSServiceBrowserCallback callback; + void* userdata; - AVAHI_LLIST_FIELDS(AvahiServiceBrowser, browser); + AVAHI_LLIST_FIELDS(AvahiSServiceBrowser, browser); }; -static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) { - AvahiServiceBrowser *b = userdata; - gchar *n, *e, *c, *s; - gchar service[128]; +static void record_browser_callback( + AvahiSRecordBrowser*rr, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiBrowserEvent event, + AvahiRecord *record, + AvahiLookupResultFlags flags, + void* userdata) { - g_assert(rr); - g_assert(record); - g_assert(b); + AvahiSServiceBrowser *b = userdata; - g_assert(record->key->type == AVAHI_DNS_TYPE_PTR); + assert(rr); + assert(b); - c = n = avahi_normalize_name(record->data.ptr.name); + /* Filter flags */ + flags &= AVAHI_LOOKUP_RESULT_CACHED | AVAHI_LOOKUP_RESULT_MULTICAST | AVAHI_LOOKUP_RESULT_WIDE_AREA; - if (!(avahi_unescape_label((const gchar**) &c, service, sizeof(service)))) - goto fail; + if (record) { + char service[AVAHI_LABEL_MAX], type[AVAHI_DOMAIN_NAME_MAX], domain[AVAHI_DOMAIN_NAME_MAX]; - for (s = e = c; *c == '_';) { - c += strcspn(c, "."); + assert(record->key->type == AVAHI_DNS_TYPE_PTR); - if (*c == 0) - goto fail; + if (event == AVAHI_BROWSER_NEW && avahi_server_is_service_local(b->server, interface, protocol, record->data.ptr.name)) + flags |= AVAHI_LOOKUP_RESULT_LOCAL; - g_assert(*c == '.'); - e = c; - c++; - } - - *e = 0; + if (avahi_service_name_split(record->data.ptr.name, service, sizeof(service), type, sizeof(type), domain, sizeof(domain)) < 0) { + avahi_log_warn("Failed to split '%s'", record->key->name); + return; + } - if (!avahi_domain_equal(c, b->domain_name)) - goto fail; - - b->callback(b, interface, protocol, event, service, s, c, b->userdata); - g_free(n); + b->callback(b, interface, protocol, event, service, type, domain, flags, b->userdata); - return; + } else + b->callback(b, interface, protocol, event, NULL, b->service_type, b->domain_name, flags, b->userdata); -fail: - avahi_log_warn("Invalid service '%s'", n); - g_free(n); } -AvahiServiceBrowser *avahi_service_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *service_type, const gchar *domain, AvahiServiceBrowserCallback callback, gpointer userdata) { - AvahiServiceBrowser *b; - AvahiKey *k; - gchar *n = NULL; - - g_assert(server); - g_assert(callback); - g_assert(service_type); - - if (!avahi_valid_service_type(service_type)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_TYPE); +AvahiSServiceBrowser *avahi_s_service_browser_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *service_type, + const char *domain, + AvahiLookupFlags flags, + AvahiSServiceBrowserCallback callback, + void* userdata) { + + AvahiSServiceBrowser *b; + AvahiKey *k = NULL; + char n[AVAHI_DOMAIN_NAME_MAX]; + int r; + + assert(server); + assert(callback); + assert(service_type); + + 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, !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); + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type_generic(service_type), AVAHI_ERR_INVALID_SERVICE_TYPE); + + if (!domain) + domain = server->domain_name; + + if ((r = avahi_service_name_join(n, sizeof(n), NULL, service_type, domain)) < 0) { + avahi_server_set_errno(server, r); return NULL; } - if (domain && !avahi_valid_domain_name(domain)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME); + if (!(b = avahi_new(AvahiSServiceBrowser, 1))) { + avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY); return NULL; } - b = g_new(AvahiServiceBrowser, 1); b->server = server; - b->domain_name = avahi_normalize_name(domain ? domain : "local"); - b->service_type = avahi_normalize_name(service_type); + b->domain_name = b->service_type = NULL; b->callback = callback; b->userdata = userdata; - AVAHI_LLIST_PREPEND(AvahiServiceBrowser, browser, server->service_browsers, b); + b->record_browser = NULL; - n = g_strdup_printf("%s.%s", b->service_type, b->domain_name); - k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR); - g_free(n); - - b->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, b); + AVAHI_LLIST_PREPEND(AvahiSServiceBrowser, browser, server->service_browsers, b); - avahi_key_unref(k); + if (!(b->domain_name = avahi_normalize_name_strdup(domain)) || + !(b->service_type = avahi_normalize_name_strdup(service_type))) { + avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY); + goto fail; + } - if (!b->record_browser) { - avahi_service_browser_free(b); - return NULL; + 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; } - + + 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_service_browser_free(b); + return NULL; } -void avahi_service_browser_free(AvahiServiceBrowser *b) { - g_assert(b); +void avahi_s_service_browser_free(AvahiSServiceBrowser *b) { + assert(b); - AVAHI_LLIST_REMOVE(AvahiServiceBrowser, browser, b->server->service_browsers, b); + AVAHI_LLIST_REMOVE(AvahiSServiceBrowser, browser, b->server->service_browsers, b); if (b->record_browser) - avahi_record_browser_free(b->record_browser); - - g_free(b->domain_name); - g_free(b->service_type); - g_free(b); + avahi_s_record_browser_free(b->record_browser); + + avahi_free(b->domain_name); + avahi_free(b->service_type); + avahi_free(b); }