diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-10-23 20:21:39 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-10-23 20:21:39 +0000 |
commit | e865e3dba3c6ee5de5581dbfbafc025aa5c9947e (patch) | |
tree | 7630d4d1b2f9982d1c5df4dad767ea7511ad33ee /avahi-core/resolve-address.c | |
parent | 0d0c9486e3fe26fdd67624ee57961ba2d5846ebb (diff) |
* correctly handle empty domain names (i.e. the root zone)
* fix memory initialization error in wide-area.c
* make server_add_xx() functions atomic, i.e. clean up half-created entries on failure
* add some more validity checking macros and change everything to make use of them
* clean up avahi_server_add_address()
* change some functions from domain.[ch] to work on a stack buffer instead of malloced memory
* update avahi-test.c a little
* replace avahi_reverse_lookup_name_{ipv4,ipv6}() with a single function avahi_reverse_lookup_name()
* remove avahi_server_add_dns_server_name() from public API
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@845 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/resolve-address.c')
-rw-r--r-- | avahi-core/resolve-address.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c index 08168b6..c9aae0c 100644 --- a/avahi-core/resolve-address.c +++ b/avahi-core/resolve-address.c @@ -26,6 +26,7 @@ #include <avahi-common/timeval.h> #include <avahi-common/malloc.h> #include <avahi-common/error.h> +#include <avahi-common/domain.h> #include "browse.h" @@ -184,7 +185,7 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( AvahiSAddressResolver *r; AvahiKey *k; - char *n; + char n[AVAHI_DOMAIN_NAME_MAX]; assert(server); assert(address); @@ -202,20 +203,9 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( return NULL; } - if (address->proto == AVAHI_PROTO_INET) - n = avahi_reverse_lookup_name_ipv4(&address->data.ipv4); - else - n = avahi_reverse_lookup_name_ipv6(&address->data.ipv6); + avahi_reverse_lookup_name(n, sizeof(n), address); - if (!n) { - avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY); - return NULL; - } - - k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR); - avahi_free(n); - - if (!k) { + if (!(k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR))) { avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY); return NULL; } |