* make all flags parameters UINT32 when marshalling for DBUS

[catta] / avahi-core / browse-service.c

diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
index 7ed6ded9b78d9a19c43099da3251ae40fa925178..dfa6050c9bf2f42b3cc05cb6d4c305f5d7a80fdf 100644 (file)
--- a/avahi-core/browse-service.c
+++ b/avahi-core/browse-service.c
@@ -27,56 +27,67 @@
 
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 #include "log.h"
 
-struct AvahiServiceBrowser {
+struct AvahiSServiceBrowser {
     AvahiServer *server;
     char *domain_name;
     char *service_type;
     
-    AvahiRecordBrowser *record_browser;
+    AvahiSRecordBrowser *record_browser;
 
-    AvahiServiceBrowserCallback callback;
+    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, void* userdata) {
-    AvahiServiceBrowser *b = userdata;
-    char *n, *e, *c, *s;
+static void record_browser_callback(
+    AvahiSRecordBrowser*rr,
+    AvahiIfIndex interface,
+    AvahiProtocol protocol,
+    AvahiBrowserEvent event,
+    AvahiRecord *record,
+    AvahiLookupResultFlags flags,
+    void* userdata) {
+    
+    AvahiSServiceBrowser *b = userdata;
+    char *n = NULL, *c = NULL, *s = NULL;
     char service[128];
 
     assert(rr);
-    assert(record);
     assert(b);
 
-    assert(record->key->type == AVAHI_DNS_TYPE_PTR);
-
-    c = n = avahi_normalize_name(record->data.ptr.name);
-
-    if (!(avahi_unescape_label((const char**) &c, service, sizeof(service))))
-        goto fail;
-
-    for (s = e = c; *c == '_';) {
-        c += strcspn(c, ".");
-
-        if (*c == 0)
+    if (record) {
+        char *e;
+        assert(record->key->type == AVAHI_DNS_TYPE_PTR);
+        
+        c = n = avahi_normalize_name(record->data.ptr.name);
+        
+        if (!(avahi_unescape_label((const char**) &c, service, sizeof(service))))
+            goto fail;
+        
+        for (s = e = c; *c == '_';) {
+            c += strcspn(c, ".");
+            
+            if (*c == 0)
+                goto fail;
+            
+            assert(*c == '.');
+            e = c;
+            c++;
+        }
+        
+        *e = 0;
+
+        if (!avahi_domain_equal(c, b->domain_name))
             goto fail;
-
-        assert(*c == '.');
-        e = c;
-        c++;
     }
-
-    *e = 0;
-
-    if (!avahi_domain_equal(c, b->domain_name))
-        goto fail;
     
-    b->callback(b, interface, protocol, event, service, s, c, b->userdata);
+    b->callback(b, interface, protocol, event, record ? service : NULL, s, c, flags, b->userdata);
     avahi_free(n);
 
     return;
@@ -86,8 +97,17 @@ fail:
     avahi_free(n);
 }
 
-AvahiServiceBrowser *avahi_service_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const char *service_type, const char *domain, AvahiServiceBrowserCallback callback, void* userdata) {
-    AvahiServiceBrowser *b;
+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;
     char *n = NULL;
     
@@ -105,41 +125,49 @@ AvahiServiceBrowser *avahi_service_browser_new(AvahiServer *server, AvahiIfIndex
         return NULL;
     }
 
-    if (!(b = avahi_new(AvahiServiceBrowser, 1))) {
+    if (!domain)
+        domain = server->domain_name;
+    
+    if (!AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS);
+        return NULL;
+    }
+    
+    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->domain_name = avahi_normalize_name(domain);
     b->service_type = avahi_normalize_name(service_type);
     b->callback = callback;
     b->userdata = userdata;
-    AVAHI_LLIST_PREPEND(AvahiServiceBrowser, browser, server->service_browsers, b);
+    AVAHI_LLIST_PREPEND(AvahiSServiceBrowser, browser, server->service_browsers, b);
 
     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);
     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, flags, record_browser_callback, b);
 
     avahi_key_unref(k);
 
     if (!b->record_browser) {
-        avahi_service_browser_free(b);
+        avahi_s_service_browser_free(b);
         return NULL;
     }
     
     return b;
 }
 
-void avahi_service_browser_free(AvahiServiceBrowser *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);
+        avahi_s_record_browser_free(b->record_browser);
     
     avahi_free(b->domain_name);
     avahi_free(b->service_type);