update TODO

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

diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index 31b00815798ee7baac1f8b1d8d75e1aa79c730f2..43b61d26f9fdefc8517a4020cca78c4d47641f69 100644 (file)
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -195,10 +195,10 @@ static void record_browser_callback(
             int changed = 0;
             assert(record);
             
-            if (r->interface > 0 && interface != r->interface)
+            if (r->interface > 0 && interface > 0 &&  interface != r->interface)
                 return;
             
-            if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
+            if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
                 return;
             
             if (r->interface <= 0)
@@ -349,6 +349,24 @@ static void record_browser_callback(
         case AVAHI_BROWSER_NOT_FOUND:
         case AVAHI_BROWSER_FAILURE:
 
+            
+            if (rr == r->record_browser_a && r->record_browser_aaaa) {
+                /* We were looking for both AAAA and A, and the other query is still living, so we'll not die */
+                avahi_s_record_browser_free(r->record_browser_a);
+                r->record_browser_a = NULL;
+                break;
+            }
+
+            if (rr == r->record_browser_aaaa && r->record_browser_a) {
+                /* We were looking for both AAAA and A, and the other query is still living, so we'll not die */
+                avahi_s_record_browser_free(r->record_browser_aaaa);
+                r->record_browser_aaaa = NULL;
+                break;
+            }
+
+
+            /* Hmm, everything's lost, tell the user */
+            
             if (r->record_browser_srv)
                 avahi_s_record_browser_free(r->record_browser_srv);
             if (r->record_browser_txt)
@@ -379,39 +397,26 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
     
     AvahiSServiceResolver *r;
     AvahiKey *k;
-    char t[256];
+    char n[AVAHI_DOMAIN_NAME_MAX];
+    int ret;
     
     assert(server);
     assert(type);
     assert(callback);
 
-    assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
-
-    if (!AVAHI_IF_VALID(interface)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_INTERFACE);
-        return NULL;
-    }
-
-    if (name && !avahi_is_valid_service_name(name)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_NAME);
-        return NULL;
-    }
-
-    if (!avahi_is_valid_service_type(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;
-    }
+    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, AVAHI_PROTO_VALID(aprotocol), 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, !name || avahi_is_valid_service_name(name), AVAHI_ERR_INVALID_SERVICE_NAME);
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type(type), AVAHI_ERR_INVALID_SERVICE_TYPE);
+    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST|AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), AVAHI_ERR_INVALID_FLAGS);
 
     if (!domain)
         domain = server->domain_name;
-    
-    if (!AVAHI_VALID_FLAGS(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST|AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS)) {
-        avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS);
+
+    if ((ret = avahi_service_name_join(n, sizeof(n), name, type, domain)) < 0) {
+        avahi_server_set_errno(server, ret);
         return NULL;
     }
     
@@ -422,8 +427,8 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
     
     r->server = server;
     r->service_name = avahi_strdup(name);
-    r->service_type = avahi_normalize_name(type);
-    r->domain_name = avahi_normalize_name(domain);
+    r->service_type = avahi_normalize_name_strdup(type);
+    r->domain_name = avahi_normalize_name_strdup(domain);
     r->callback = callback;
     r->userdata = userdata;
     r->address_protocol = aprotocol;
@@ -432,25 +437,11 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
     r->interface = interface;
     r->protocol = protocol;
     r->user_flags = flags;
-
-    if (name) {
-        char *n;
-        size_t l;
-
-        n = t;
-        l = sizeof(t);
-        avahi_escape_label((const uint8_t*) name, strlen(name), &n, &l);
-        snprintf(n, l, ".%s.%s", r->service_type, r->domain_name);
-    } else
-        snprintf(t, sizeof(t), "%s.%s", r->service_type, r->domain_name);
-
+    r->record_browser_a = r->record_browser_aaaa = r->record_browser_srv = r->record_browser_txt = NULL;
     r->time_event = NULL;
-    
     AVAHI_LLIST_PREPEND(AvahiSServiceResolver, resolver, server->service_resolvers, r);
 
-    r->record_browser_a = r->record_browser_aaaa = r->record_browser_srv = r->record_browser_txt = NULL;
-    
-    k = avahi_key_new(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV);
+    k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV);
     r->record_browser_srv = avahi_s_record_browser_new(server, interface, protocol, k, flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r);
     avahi_key_unref(k);
 
@@ -460,7 +451,7 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
     }
 
     if (!(flags & AVAHI_LOOKUP_NO_TXT)) {
-        k = avahi_key_new(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT);
+        k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT);
         r->record_browser_txt = avahi_s_record_browser_new(server, interface, protocol, k, flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS),  record_browser_callback, r);
         avahi_key_unref(k);