diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-10-12 02:37:08 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-10-12 02:37:08 +0000 |
| commit | bb14e0a8aa3173c8a6d80b1a9c8b300a452ee9f1 (patch) | |
| tree | d29ec90346b7523aa877207ae29e461b767460c6 /avahi-core/resolve-address.c | |
| parent | 7484feb19b10878042dcb8cea618d10df5440c1c (diff) | |
* 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
Diffstat (limited to 'avahi-core/resolve-address.c')
| -rw-r--r-- | avahi-core/resolve-address.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c index 704dab4..661982d 100644 --- a/avahi-core/resolve-address.c +++ b/avahi-core/resolve-address.c @@ -62,8 +62,6 @@ static void finish(AvahiSAddressResolver *r, AvahiResolverEvent event) { } switch (event) { - case AVAHI_RESOLVER_NOT_FOUND: - case AVAHI_RESOLVER_TIMEOUT: case AVAHI_RESOLVER_FAILURE: r->callback(r, r->interface, r->protocol, event, &r->address, NULL, r->flags, r->userdata); break; @@ -81,7 +79,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(AvahiSAddressResolver *r) { @@ -155,7 +154,7 @@ static void record_browser_callback( case AVAHI_BROWSER_ALL_FOR_NOW: break; - case AVAHI_BROWSER_NOT_FOUND: + case AVAHI_BROWSER_FAILURE: if (r->retry_with_multicast) { r->retry_with_multicast = 0; @@ -169,12 +168,9 @@ static void record_browser_callback( } } - /* Fallthrough */ - - case AVAHI_BROWSER_FAILURE: r->flags = flags; - finish(r, event == AVAHI_BROWSER_NOT_FOUND ? AVAHI_RESOLVER_NOT_FOUND : AVAHI_RESOLVER_FAILURE); - + finish(r, AVAHI_RESOLVER_FAILURE); + break; } } |