X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fbrowse-service.c;h=34a2536f47903870fcc2ecc3e7ddc01b1f84f133;hb=88a99a094e561b6c87404f4999e61e7b9ed754f6;hp=10b3f33dfd5757d1957f8513d2ae32c8f4d7dac8;hpb=618af3a6a37099c7bc1e07704d48355353b3ab98;p=catta

diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
index 10b3f33..34a2536 100644
--- a/avahi-core/browse-service.c
+++ b/avahi-core/browse-service.c
@@ -27,6 +27,7 @@
 
 #include "browse.h"
 #include "util.h"
+#include "log.h"
 
 struct AvahiServiceBrowser {
     AvahiServer *server;
@@ -41,7 +42,7 @@ struct AvahiServiceBrowser {
     AVAHI_LLIST_FIELDS(AvahiServiceBrowser, 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) {
     AvahiServiceBrowser *b = userdata;
     gchar *n, *e, *c, *s;
     gchar service[128];
@@ -79,11 +80,11 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
     return;
 
 fail:
-    g_warning("Invalid service '%s'", n);
+    avahi_log_warn("Invalid service '%s'", n);
     g_free(n);
 }
 
-AvahiServiceBrowser *avahi_service_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *service_type, const gchar *domain, AvahiServiceBrowserCallback callback, gpointer userdata) {
+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;
@@ -92,21 +93,36 @@ AvahiServiceBrowser *avahi_service_browser_new(AvahiServer *server, gint interfa
     g_assert(callback);
     g_assert(service_type);
 
+    if (!avahi_valid_service_type(service_type)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_TYPE);
+        return NULL;
+    }
+
+    if (domain && !avahi_valid_domain_name(domain)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+        return NULL;
+    }
+
     b = g_new(AvahiServiceBrowser, 1);
     b->server = server;
-    b->domain_name = avahi_normalize_name(domain ? domain : "local.");
+    b->domain_name = avahi_normalize_name(domain ? domain : "local");
     b->service_type = avahi_normalize_name(service_type);
     b->callback = callback;
     b->userdata = userdata;
+    AVAHI_LLIST_PREPEND(AvahiServiceBrowser, browser, server->service_browsers, b);
 
-    n = g_strdup_printf("%s%s", b->service_type, b->domain_name);
+    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_key_unref(k);
 
-    AVAHI_LLIST_PREPEND(AvahiServiceBrowser, browser, server->service_browsers, b);
+    if (!b->record_browser) {
+        avahi_service_browser_free(b);
+        return NULL;
+    }
     
     return b;
 }
@@ -116,7 +132,9 @@ void avahi_service_browser_free(AvahiServiceBrowser *b) {
 
     AVAHI_LLIST_REMOVE(AvahiServiceBrowser, browser, b->server->service_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->service_type);
     g_free(b);