X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fbrowse-service.c;h=94191223b0d19e2b5091f9e3a2652d62acba76a9;hb=0571dc2e99dee3051632548f2e979db6b37fb650;hp=f72ce6c3440637c4fcdeb46c905af800c8943dce;hpb=f43187377e0c89ba02ca23e88efa01bbb255e037;p=catta

diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
index f72ce6c..9419122 100644
--- a/avahi-core/browse-service.c
+++ b/avahi-core/browse-service.c
@@ -25,37 +25,40 @@
 
 #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 AvahiServiceBrowser {
+struct AvahiSServiceBrowser {
     AvahiServer *server;
-    gchar *domain_name;
-    gchar *service_type;
+    char *domain_name;
+    char *service_type;
     
-    AvahiRecordBrowser *record_browser;
+    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, void* userdata) {
+    AvahiSServiceBrowser *b = userdata;
+    char *n, *e, *c, *s;
+    char service[128];
 
-    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);
 
     c = n = avahi_normalize_name(record->data.ptr.name);
 
-    if (!(avahi_unescape_label((const gchar**) &c, service, sizeof(service))))
+    if (!(avahi_unescape_label((const char**) &c, service, sizeof(service))))
         goto fail;
 
     for (s = e = c; *c == '_';) {
@@ -64,7 +67,7 @@ static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interfac
         if (*c == 0)
             goto fail;
 
-        g_assert(*c == '.');
+        assert(*c == '.');
         e = c;
         c++;
     }
@@ -75,50 +78,71 @@ static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interfac
         goto fail;
     
     b->callback(b, interface, protocol, event, service, s, c, b->userdata);
-    g_free(n);
+    avahi_free(n);
 
     return;
 
 fail:
     avahi_log_warn("Invalid service '%s'", n);
-    g_free(n);
+    avahi_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;
+AvahiSServiceBrowser *avahi_s_service_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const char *service_type, const char *domain, AvahiSServiceBrowserCallback callback, void* userdata) {
+    AvahiSServiceBrowser *b;
     AvahiKey *k;
-    gchar *n = NULL;
+    char *n = NULL;
     
-    g_assert(server);
-    g_assert(callback);
-    g_assert(service_type);
+    assert(server);
+    assert(callback);
+    assert(service_type);
+
+    if (!avahi_is_valid_service_type(service_type)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_TYPE);
+        return NULL;
+    }
+
+    if (domain && !avahi_is_valid_domain_name(domain)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+        return NULL;
+    }
 
-    b = g_new(AvahiServiceBrowser, 1);
+    if (!(b = avahi_new(AvahiSServiceBrowser, 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->service_type = avahi_normalize_name(service_type);
     b->callback = callback;
     b->userdata = userdata;
+    AVAHI_LLIST_PREPEND(AvahiSServiceBrowser, browser, server->service_browsers, b);
 
-    n = g_strdup_printf("%s.%s", b->service_type, b->domain_name);
+    n = avahi_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);
+    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(AvahiServiceBrowser, browser, server->service_browsers, b);
+    if (!b->record_browser) {
+        avahi_s_service_browser_free(b);
+        return NULL;
+    }
     
     return b;
 }
 
-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);
 
-    avahi_record_browser_free(b->record_browser);
-    g_free(b->domain_name);
-    g_free(b->service_type);
-    g_free(b);
+    if (b->record_browser)
+        avahi_s_record_browser_free(b->record_browser);
+    
+    avahi_free(b->domain_name);
+    avahi_free(b->service_type);
+    avahi_free(b);
 }