forgot to pull the publish_no_reverse change to the example.

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

diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
index d89ad7a71a6405060a4f0b0a0568ce9a719e2837..dde36bc74048775dca2a08fc934a9cc3d2f9338d 100644 (file)
--- a/avahi-core/browse-service.c
+++ b/avahi-core/browse-service.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -36,7 +34,7 @@ struct AvahiSServiceBrowser {
     AvahiServer *server;
     char *domain_name;
     char *service_type;
-    
+
     AvahiSRecordBrowser *record_browser;
 
     AvahiSServiceBrowserCallback callback;
@@ -53,24 +51,30 @@ static void record_browser_callback(
     AvahiRecord *record,
     AvahiLookupResultFlags flags,
     void* userdata) {
-    
+
     AvahiSServiceBrowser *b = userdata;
 
     assert(rr);
     assert(b);
 
+    /* Filter flags */
+    flags &= AVAHI_LOOKUP_RESULT_CACHED | AVAHI_LOOKUP_RESULT_MULTICAST | AVAHI_LOOKUP_RESULT_WIDE_AREA;
+
     if (record) {
         char service[AVAHI_LABEL_MAX], type[AVAHI_DOMAIN_NAME_MAX], domain[AVAHI_DOMAIN_NAME_MAX];
 
         assert(record->key->type == AVAHI_DNS_TYPE_PTR);
 
+        if (event == AVAHI_BROWSER_NEW && avahi_server_is_service_local(b->server, interface, protocol, record->data.ptr.name))
+            flags |= AVAHI_LOOKUP_RESULT_LOCAL;
+
         if (avahi_service_name_split(record->data.ptr.name, service, sizeof(service), type, sizeof(type), domain, sizeof(domain)) < 0) {
             avahi_log_warn("Failed to split '%s'", record->key->name);
             return;
         }
 
         b->callback(b, interface, protocol, event, service, type, domain, flags, b->userdata);
-        
+
     } else
         b->callback(b, interface, protocol, event, NULL, b->service_type, b->domain_name, flags, b->userdata);
 
@@ -90,7 +94,7 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
     AvahiKey *k = NULL;
     char n[AVAHI_DOMAIN_NAME_MAX];
     int r;
-    
+
     assert(server);
     assert(callback);
     assert(service_type);
@@ -99,7 +103,7 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL);
     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME);
     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
-    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type(service_type), AVAHI_ERR_INVALID_SERVICE_TYPE);
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type_generic(service_type), AVAHI_ERR_INVALID_SERVICE_TYPE);
 
     if (!domain)
         domain = server->domain_name;
@@ -108,18 +112,18 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
         avahi_server_set_errno(server, r);
         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 = b->service_type = NULL;
     b->callback = callback;
     b->userdata = userdata;
     b->record_browser = NULL;
-    
+
     AVAHI_LLIST_PREPEND(AvahiSServiceBrowser, browser, server->service_browsers, b);
 
     if (!(b->domain_name = avahi_normalize_name_strdup(domain)) ||
@@ -127,12 +131,12 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
         goto fail;
     }
-    
+
     if (!(k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR))) {
         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
         goto fail;
     }
-    
+
     if (!(b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b)))
         goto fail;
 
@@ -144,7 +148,7 @@ fail:
 
     if (k)
         avahi_key_unref(k);
-    
+
     avahi_s_service_browser_free(b);
     return NULL;
 }
@@ -156,7 +160,7 @@ void avahi_s_service_browser_free(AvahiSServiceBrowser *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);