X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fbrowse-service-type.c;h=896e46bacd3788b5cfd84f199c617544800ab2a2;hb=b30495599b156ac933d091bb0cc1ed669c7887b5;hp=21c115790117c68b017bd56719314611734102a3;hpb=c0244c2448a5504581ae24e78b5859760b999b8e;p=catta

diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
index 21c1157..896e46b 100644
--- a/avahi-core/browse-service-type.c
+++ b/avahi-core/browse-service-type.c
@@ -25,31 +25,34 @@
 
 #include <string.h>
 
+#include <avahi-common/domain.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+
 #include "browse.h"
-#include "util.h"
 #include "log.h"
 
-struct AvahiServiceTypeBrowser {
+struct AvahiSServiceTypeBrowser {
     AvahiServer *server;
-    gchar *domain_name;
+    char *domain_name;
     
-    AvahiRecordBrowser *record_browser;
+    AvahiSRecordBrowser *record_browser;
 
-    AvahiServiceTypeBrowserCallback callback;
-    gpointer userdata;
+    AvahiSServiceTypeBrowserCallback callback;
+    void* userdata;
 
-    AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, browser);
+    AVAHI_LLIST_FIELDS(AvahiSServiceTypeBrowser, browser);
 };
 
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
-    AvahiServiceTypeBrowser *b = userdata;
-    gchar *n, *e, *c;
+static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) {
+    AvahiSServiceTypeBrowser *b = userdata;
+    char *n, *e, *c;
 
-    g_assert(rr);
-    g_assert(record);
-    g_assert(b);
+    assert(rr);
+    assert(record);
+    assert(b);
 
-    g_assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+    assert(record->key->type == AVAHI_DNS_TYPE_PTR);
 
     n = avahi_normalize_name(record->data.ptr.name);
 
@@ -62,7 +65,7 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
         if (*c == 0)
             goto fail;
 
-        g_assert(*c == '.');
+        assert(*c == '.');
         e = c;
         c++;
     }
@@ -73,50 +76,63 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
         goto fail;
     
     b->callback(b, interface, protocol, event, n, c, b->userdata);
-    g_free(n);
+    avahi_free(n);
 
     return;
 
 fail:
     avahi_log_warn("Invalid service type '%s'", n);
-    g_free(n);
+    avahi_free(n);
 }
 
-AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiServiceTypeBrowserCallback callback, gpointer userdata) {
-    AvahiServiceTypeBrowser *b;
+AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const char *domain, AvahiSServiceTypeBrowserCallback callback, void* userdata) {
+    AvahiSServiceTypeBrowser *b;
     AvahiKey *k;
-    gchar *n = NULL;
+    char *n = NULL;
     
-    g_assert(server);
-    g_assert(callback);
+    assert(server);
+    assert(callback);
+
+    if (domain && !avahi_is_valid_domain_name(domain)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+        return NULL;
+    }
 
-    b = g_new(AvahiServiceTypeBrowser, 1);
+    if (!(b = avahi_new(AvahiSServiceTypeBrowser, 1))) {
+        avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+        return NULL;
+    }
+    
     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(AvahiSServiceTypeBrowser, browser, server->service_type_browsers, b);
 
-    n = g_strdup_printf("_services._dns-sd._udp.%s", b->domain_name);
+    n = avahi_strdup_printf("_services._dns-sd._udp.%s", b->domain_name);
     k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
-    g_free(n);
+    avahi_free(n);
     
-    b->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, b);
+    b->record_browser = avahi_s_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;
 }
 
-void avahi_service_type_browser_free(AvahiServiceTypeBrowser *b) {
-    g_assert(b);
+void avahi_s_service_type_browser_free(AvahiSServiceTypeBrowser *b) {
+    assert(b);
 
-    AVAHI_LLIST_REMOVE(AvahiServiceTypeBrowser, browser, b->server->service_type_browsers, b);
+    AVAHI_LLIST_REMOVE(AvahiSServiceTypeBrowser, browser, b->server->service_type_browsers, b);
 
-    avahi_record_browser_free(b->record_browser);
-    g_free(b->domain_name);
-    g_free(b);
+    if (b->record_browser)
+        avahi_s_record_browser_free(b->record_browser);
+    
+    avahi_free(b->domain_name);
+    avahi_free(b);
 }