X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-host-name.c;h=c10119a4fccfc6eea4da5c116914b3264bad94d0;hb=ad7b145ebe82c3a53632eaa6ec75b014d91a7bea;hp=9fbf80345d37cbec3097f6fc3df48a13ef8d6ce9;hpb=22a61b042376903deada022e7585e0585aaa7d43;p=catta

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 9fbf803..c10119a 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "resolve.h"
+#include "browse.h"
 #include "util.h"
 
 struct AvahiHostNameResolver {
@@ -55,9 +55,11 @@ static void finish(AvahiHostNameResolver *r, gint interface, guchar protocol, Av
         avahi_record_browser_free(r->record_browser_aaaa);
         r->record_browser_aaaa = NULL;
     }
- 
-    avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
-    r->time_event = NULL;
+
+    if (r->time_event) {
+        avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+        r->time_event = NULL;
+    }
 
     if (record) {
         switch (record->key->type) {
@@ -119,24 +121,24 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint in
     r->callback = callback;
     r->userdata = userdata;
 
+    r->record_browser_a = r->record_browser_aaaa = NULL;
+        
+    avahi_elapse_time(&tv, 1000, 0);
+    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
+
+    AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
+    
     if (aprotocol == AF_INET || aprotocol == AF_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
         r->record_browser_a = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
-    } else
-        r->record_browser_a = NULL;
+    } 
 
     if (aprotocol == AF_INET6 || aprotocol == AF_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
         r->record_browser_aaaa = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
-    } else
-        r->record_browser_aaaa = NULL;
-
-    avahi_elapse_time(&tv, 1000, 0);
-    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
-    
-    AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
+    }
     
     return r;
 }
@@ -148,8 +150,12 @@ void avahi_host_name_resolver_free(AvahiHostNameResolver *r) {
 
     if (r->record_browser_a)
         avahi_record_browser_free(r->record_browser_a);
+
     if (r->record_browser_aaaa)
         avahi_record_browser_free(r->record_browser_aaaa);
+
+    if (r->time_event)
+        avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
     
     g_free(r->host_name);
     g_free(r);