X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-host-name.c;h=a38c0014736657ab58eda8fd18b74245d4589e36;hb=0e203251414d56b3f6b8d4dafde19a1d27b18caf;hp=940febf403feeb23034ad5df016da4ddc326f244;hpb=424aefe8a431b79496672799dc4f4430fa935252;p=catta diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c index 940febf..a38c001 100644 --- a/avahi-core/resolve-host-name.c +++ b/avahi-core/resolve-host-name.c @@ -89,8 +89,6 @@ static void finish(AvahiSHostNameResolver *r, AvahiResolverEvent event) { } - case AVAHI_RESOLVER_TIMEOUT: - case AVAHI_RESOLVER_NOT_FOUND: case AVAHI_RESOLVER_FAILURE: r->callback(r, r->interface, r->protocol, event, r->host_name, NULL, r->flags, r->userdata); @@ -104,7 +102,8 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) { assert(e); assert(r); - finish(r, AVAHI_RESOLVER_TIMEOUT); + avahi_server_set_errno(r->server, AVAHI_ERR_TIMEOUT); + finish(r, AVAHI_RESOLVER_FAILURE); } static void start_timeout(AvahiSHostNameResolver *r) { @@ -188,7 +187,6 @@ static void record_browser_callback( break; case AVAHI_BROWSER_FAILURE: - case AVAHI_BROWSER_NOT_FOUND: /* Stop browsers */ @@ -200,7 +198,7 @@ static void record_browser_callback( r->record_browser_a = r->record_browser_aaaa = NULL; r->flags = flags; - finish(r, event == AVAHI_BROWSER_FAILURE ? AVAHI_RESOLVER_FAILURE : AVAHI_RESOLVER_NOT_FOUND); + finish(r, AVAHI_RESOLVER_FAILURE); break; } } @@ -245,7 +243,7 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( } r->server = server; - r->host_name = avahi_normalize_name(host_name); + r->host_name = avahi_normalize_name_strdup(host_name); r->callback = callback; r->userdata = userdata; r->address_record = NULL;