forgot to pull the publish_no_reverse change to the example.

[catta] / avahi-core / resolve-address.c

diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index a278beebbb6c99d7938d6f7dd38395c7db9173dc..dd4adbc45501f52c2f50e5120c7f0172193643c4 100644 (file)
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.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
@@ -37,7 +35,7 @@
 struct AvahiSAddressResolver {
     AvahiServer *server;
     AvahiAddress address;
-    
+
     AvahiSRecordBrowser *record_browser;
 
     AvahiSAddressResolverCallback callback;
@@ -58,7 +56,7 @@ struct AvahiSAddressResolver {
 
 static void finish(AvahiSAddressResolver *r, AvahiResolverEvent event) {
     assert(r);
-    
+
     if (r->time_event) {
         avahi_time_event_free(r->time_event);
         r->time_event = NULL;
@@ -78,7 +76,7 @@ static void finish(AvahiSAddressResolver *r, AvahiResolverEvent event) {
 
 static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
     AvahiSAddressResolver *r = userdata;
-    
+
     assert(e);
     assert(r);
 
@@ -105,53 +103,53 @@ static void record_browser_callback(
     AvahiRecord *record,
     AvahiLookupResultFlags flags,
     void* userdata) {
-    
+
     AvahiSAddressResolver *r = userdata;
 
     assert(rr);
     assert(r);
 
     switch (event) {
-        case AVAHI_BROWSER_NEW: 
+        case AVAHI_BROWSER_NEW:
             assert(record);
             assert(record->key->type == AVAHI_DNS_TYPE_PTR);
-            
+
             if (r->interface > 0 && interface != r->interface)
                 return;
-            
+
             if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
                 return;
-            
+
             if (r->interface <= 0)
                 r->interface = interface;
-            
+
             if (r->protocol == AVAHI_PROTO_UNSPEC)
                 r->protocol = protocol;
-            
+
             if (!r->ptr_record) {
                 r->ptr_record = avahi_record_ref(record);
                 r->flags = flags;
-                
+
                 finish(r, AVAHI_RESOLVER_FOUND);
             }
             break;
-            
+
         case AVAHI_BROWSER_REMOVE:
             assert(record);
             assert(record->key->type == AVAHI_DNS_TYPE_PTR);
-            
+
             if (r->ptr_record && avahi_record_equal_no_ttl(record, r->ptr_record)) {
                 avahi_record_unref(r->ptr_record);
                 r->ptr_record = NULL;
                 r->flags = flags;
-                
+
                 /** Look for a replacement */
                 avahi_s_record_browser_restart(r->record_browser);
                 start_timeout(r);
             }
 
             break;
-            
+
         case AVAHI_BROWSER_CACHE_EXHAUSTED:
         case AVAHI_BROWSER_ALL_FOR_NOW:
             break;
@@ -184,7 +182,7 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
     AvahiLookupFlags flags,
     AvahiSAddressResolverCallback callback,
     void* userdata) {
-    
+
     AvahiSAddressResolver *r;
     AvahiKey *k;
     char n[AVAHI_DOMAIN_NAME_MAX];
@@ -193,17 +191,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
     assert(address);
     assert(callback);
 
-    assert(address->proto == AVAHI_PROTO_INET || address->proto == AVAHI_PROTO_INET6);
-
-    if (!AVAHI_IF_VALID(interface)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_INTERFACE);
-        return NULL;
-    }
-
-    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;
-    }
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_IF_VALID(interface), AVAHI_ERR_INVALID_INTERFACE);
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL);
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, address->proto == AVAHI_PROTO_INET || address->proto == AVAHI_PROTO_INET6, AVAHI_ERR_INVALID_PROTOCOL);
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
 
     avahi_reverse_lookup_name(address, n, sizeof(n));
 
@@ -217,7 +208,7 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
         avahi_key_unref(k);
         return NULL;
     }
-    
+
     r->server = server;
     r->address = *address;
     r->callback = callback;
@@ -243,7 +234,7 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
             r->retry_with_multicast = 1;
         }
     }
-    
+
     r->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, r);
 
     if (!r->record_browser) {
@@ -252,7 +243,7 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
     }
 
     start_timeout(r);
-    
+
     return r;
 }
 
@@ -272,6 +263,6 @@ void avahi_s_address_resolver_free(AvahiSAddressResolver *r) {
 
     if (r->key)
         avahi_key_unref(r->key);
-    
+
     avahi_free(r);
 }