From bb14e0a8aa3173c8a6d80b1a9c8b300a452ee9f1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 12 Oct 2005 02:37:08 +0000 Subject: * drop AVAHI_RESOLVER_TIMEOUT, AVAHI_RESOLVER_NOT_FOUND and AVAHI_BROWSER_NOT_FOUND, use AVAHI_xxx_FAILURE instead * set the client/server errno variable when AVAHI_xxx_FAILURE happens * update DBUS interface accordingly, pass errno value with Failure events * Pass DNS return codes to the app by wrapping them in avahi error codes git-svn-id: file:///home/lennart/svn/public/avahi/trunk@732 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/resolve-host-name.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'avahi-core/resolve-host-name.c') diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c index 6315dbb..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; } } -- cgit