X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fbrowse-service-type.c;h=3534b6fa9d529d238b1d2cd95eed45ebb46c7bb6;hb=88a99a094e561b6c87404f4999e61e7b9ed754f6;hp=d9816927209d769df74adb0c41e270b743ca8254;hpb=de7d6694f611157f0d74118a2755bbe7357f7479;p=catta

diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
index d981692..3534b6f 100644
--- a/avahi-core/browse-service-type.c
+++ b/avahi-core/browse-service-type.c
@@ -27,6 +27,7 @@
 
 #include "browse.h"
 #include "util.h"
+#include "log.h"
 
 struct AvahiServiceTypeBrowser {
     AvahiServer *server;
@@ -40,7 +41,7 @@ struct AvahiServiceTypeBrowser {
     AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, browser);
 };
 
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
+static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
     AvahiServiceTypeBrowser *b = userdata;
     gchar *n, *e, *c;
 
@@ -71,17 +72,17 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
     if (!avahi_domain_equal(c, b->domain_name))
         goto fail;
     
-    b->callback(b, interface, protocol, event, n, b->domain_name, b->userdata);
+    b->callback(b, interface, protocol, event, n, c, b->userdata);
     g_free(n);
 
     return;
 
 fail:
-    g_warning("Invalid service type '%s'", n);
+    avahi_log_warn("Invalid service type '%s'", n);
     g_free(n);
 }
 
-AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiServiceTypeBrowserCallback callback, gpointer userdata) {
+AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gint interface, AvahiProtocol protocol, const gchar *domain, AvahiServiceTypeBrowserCallback callback, gpointer userdata) {
     AvahiServiceTypeBrowser *b;
     AvahiKey *k;
     gchar *n = NULL;
@@ -89,12 +90,18 @@ AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gin
     g_assert(server);
     g_assert(callback);
 
+    if (domain && !avahi_valid_domain_name(domain)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+        return NULL;
+    }
+
     b = g_new(AvahiServiceTypeBrowser, 1);
     b->server = server;
-    b->domain_name = avahi_normalize_name(domain ? domain : "local.");
+    b->domain_name = avahi_normalize_name(domain ? domain : "local");
     b->callback = callback;
     b->userdata = userdata;
 
+    AVAHI_LLIST_PREPEND(AvahiServiceTypeBrowser, browser, server->service_type_browsers, b);
 
     n = g_strdup_printf("_services._dns-sd._udp.%s", b->domain_name);
     k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
@@ -103,7 +110,8 @@ AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gin
     b->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, b);
     avahi_key_unref(k);
 
-    AVAHI_LLIST_PREPEND(AvahiServiceTypeBrowser, browser, server->service_type_browsers, b);
+    if (!b->record_browser)
+        return NULL;
     
     return b;
 }
@@ -113,7 +121,9 @@ void avahi_service_type_browser_free(AvahiServiceTypeBrowser *b) {
 
     AVAHI_LLIST_REMOVE(AvahiServiceTypeBrowser, browser, b->server->service_type_browsers, b);
 
-    avahi_record_browser_free(b->record_browser);
+    if (b->record_browser)
+        avahi_record_browser_free(b->record_browser);
+    
     g_free(b->domain_name);
     g_free(b);
 }