X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fresolve-service.c;h=0f6177ad95aebffadda5d0ec523bc867ef8f5a24;hb=d80c70d36363762e0cf1534e654e122d741fbc5d;hp=6625c285a54e362907beb68acf52809763bf9d12;hpb=37d19f15523b6fe4d1fef2329abe421221b3d4b3;p=catta diff --git a/src/resolve-service.c b/src/resolve-service.c index 6625c28..0f6177a 100644 --- a/src/resolve-service.c +++ b/src/resolve-service.c @@ -1,18 +1,18 @@ /*** - This file is part of avahi. + This file is part of catta. - avahi is free software; you can redistribute it and/or modify it + catta is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - avahi is distributed in the hope that it will be useful, but WITHOUT + catta is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with avahi; if not, write to the Free Software + License along with catta; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ @@ -25,50 +25,50 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "browse.h" -#include +#include #define TIMEOUT_MSEC 5000 -struct AvahiSServiceResolver { - AvahiServer *server; +struct CattaSServiceResolver { + CattaServer *server; char *service_name; char *service_type; char *domain_name; - AvahiProtocol address_protocol; + CattaProtocol address_protocol; - AvahiIfIndex interface; - AvahiProtocol protocol; + CattaIfIndex iface; + CattaProtocol protocol; - AvahiSRecordBrowser *record_browser_srv; - AvahiSRecordBrowser *record_browser_txt; - AvahiSRecordBrowser *record_browser_a; - AvahiSRecordBrowser *record_browser_aaaa; + CattaSRecordBrowser *record_browser_srv; + CattaSRecordBrowser *record_browser_txt; + CattaSRecordBrowser *record_browser_a; + CattaSRecordBrowser *record_browser_aaaa; - AvahiRecord *srv_record, *txt_record, *address_record; - AvahiLookupResultFlags srv_flags, txt_flags, address_flags; + CattaRecord *srv_record, *txt_record, *address_record; + CattaLookupResultFlags srv_flags, txt_flags, address_flags; - AvahiSServiceResolverCallback callback; + CattaSServiceResolverCallback callback; void* userdata; - AvahiLookupFlags user_flags; + CattaLookupFlags user_flags; - AvahiTimeEvent *time_event; + CattaTimeEvent *time_event; - AVAHI_LLIST_FIELDS(AvahiSServiceResolver, resolver); + CATTA_LLIST_FIELDS(CattaSServiceResolver, resolver); }; -static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) { - AvahiLookupResultFlags flags; +static void finish(CattaSServiceResolver *r, CattaResolverEvent event) { + CattaLookupResultFlags flags; assert(r); if (r->time_event) { - avahi_time_event_free(r->time_event); + catta_time_event_free(r->time_event); r->time_event = NULL; } @@ -78,11 +78,11 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) { r->address_flags; switch (event) { - case AVAHI_RESOLVER_FAILURE: + case CATTA_RESOLVER_FAILURE: r->callback( r, - r->interface, + r->iface, r->protocol, event, r->service_name, @@ -97,22 +97,22 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) { break; - case AVAHI_RESOLVER_FOUND: { - AvahiAddress a; + case CATTA_RESOLVER_FOUND: { + CattaAddress a; - assert(event == AVAHI_RESOLVER_FOUND); + assert(event == CATTA_RESOLVER_FOUND); assert(r->srv_record); if (r->address_record) { switch (r->address_record->key->type) { - case AVAHI_DNS_TYPE_A: - a.proto = AVAHI_PROTO_INET; + case CATTA_DNS_TYPE_A: + a.proto = CATTA_PROTO_INET; a.data.ipv4 = r->address_record->data.a.address; break; - case AVAHI_DNS_TYPE_AAAA: - a.proto = AVAHI_PROTO_INET6; + case CATTA_DNS_TYPE_AAAA: + a.proto = CATTA_PROTO_INET6; a.data.ipv6 = r->address_record->data.aaaa.address; break; @@ -123,7 +123,7 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) { r->callback( r, - r->interface, + r->iface, r->protocol, event, r->service_name, @@ -141,38 +141,38 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) { } } -static void time_event_callback(AvahiTimeEvent *e, void *userdata) { - AvahiSServiceResolver *r = userdata; +static void time_event_callback(CattaTimeEvent *e, void *userdata) { + CattaSServiceResolver *r = userdata; assert(e); assert(r); - avahi_server_set_errno(r->server, AVAHI_ERR_TIMEOUT); - finish(r, AVAHI_RESOLVER_FAILURE); + catta_server_set_errno(r->server, CATTA_ERR_TIMEOUT); + finish(r, CATTA_RESOLVER_FAILURE); } -static void start_timeout(AvahiSServiceResolver *r) { +static void start_timeout(CattaSServiceResolver *r) { struct timeval tv; assert(r); if (r->time_event) return; - avahi_elapse_time(&tv, TIMEOUT_MSEC, 0); + catta_elapse_time(&tv, TIMEOUT_MSEC, 0); - r->time_event = avahi_time_event_new(r->server->time_event_queue, &tv, time_event_callback, r); + r->time_event = catta_time_event_new(r->server->time_event_queue, &tv, time_event_callback, r); } static void record_browser_callback( - AvahiSRecordBrowser*rr, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiBrowserEvent event, - AvahiRecord *record, - AvahiLookupResultFlags flags, + CattaSRecordBrowser*rr, + CattaIfIndex iface, + CattaProtocol protocol, + CattaBrowserEvent event, + CattaRecord *record, + CattaLookupResultFlags flags, void* userdata) { - AvahiSServiceResolver *r = userdata; + CattaSServiceResolver *r = userdata; assert(rr); assert(r); @@ -186,72 +186,72 @@ static void record_browser_callback( switch (event) { - case AVAHI_BROWSER_NEW: { + case CATTA_BROWSER_NEW: { int changed = 0; assert(record); - if (r->interface > 0 && interface > 0 && interface != r->interface) + if (r->iface > 0 && iface > 0 && iface != r->iface) return; - if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol) + if (r->protocol != CATTA_PROTO_UNSPEC && protocol != CATTA_PROTO_UNSPEC && protocol != r->protocol) return; - if (r->interface <= 0) - r->interface = interface; + if (r->iface <= 0) + r->iface = iface; - if (r->protocol == AVAHI_PROTO_UNSPEC) + if (r->protocol == CATTA_PROTO_UNSPEC) r->protocol = protocol; switch (record->key->type) { - case AVAHI_DNS_TYPE_SRV: + case CATTA_DNS_TYPE_SRV: if (!r->srv_record) { - r->srv_record = avahi_record_ref(record); + r->srv_record = catta_record_ref(record); changed = 1; if (r->record_browser_a) { - avahi_s_record_browser_free(r->record_browser_a); + catta_s_record_browser_free(r->record_browser_a); r->record_browser_a = NULL; } if (r->record_browser_aaaa) { - avahi_s_record_browser_free(r->record_browser_aaaa); + catta_s_record_browser_free(r->record_browser_aaaa); r->record_browser_aaaa = NULL; } - if (!(r->user_flags & AVAHI_LOOKUP_NO_ADDRESS)) { + if (!(r->user_flags & CATTA_LOOKUP_NO_ADDRESS)) { - if (r->address_protocol == AVAHI_PROTO_INET || r->address_protocol == AVAHI_PROTO_UNSPEC) { - AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A); - r->record_browser_a = avahi_s_record_browser_new(r->server, r->interface, r->protocol, k, r->user_flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); - avahi_key_unref(k); + if (r->address_protocol == CATTA_PROTO_INET || r->address_protocol == CATTA_PROTO_UNSPEC) { + CattaKey *k = catta_key_new(r->srv_record->data.srv.name, CATTA_DNS_CLASS_IN, CATTA_DNS_TYPE_A); + r->record_browser_a = catta_s_record_browser_new(r->server, r->iface, r->protocol, k, r->user_flags & ~(CATTA_LOOKUP_NO_TXT|CATTA_LOOKUP_NO_ADDRESS), record_browser_callback, r); + catta_key_unref(k); } - if (r->address_protocol == AVAHI_PROTO_INET6 || r->address_protocol == AVAHI_PROTO_UNSPEC) { - AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA); - r->record_browser_aaaa = avahi_s_record_browser_new(r->server, r->interface, r->protocol, k, r->user_flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); - avahi_key_unref(k); + if (r->address_protocol == CATTA_PROTO_INET6 || r->address_protocol == CATTA_PROTO_UNSPEC) { + CattaKey *k = catta_key_new(r->srv_record->data.srv.name, CATTA_DNS_CLASS_IN, CATTA_DNS_TYPE_AAAA); + r->record_browser_aaaa = catta_s_record_browser_new(r->server, r->iface, r->protocol, k, r->user_flags & ~(CATTA_LOOKUP_NO_TXT|CATTA_LOOKUP_NO_ADDRESS), record_browser_callback, r); + catta_key_unref(k); } } } break; - case AVAHI_DNS_TYPE_TXT: + case CATTA_DNS_TYPE_TXT: - assert(!(r->user_flags & AVAHI_LOOKUP_NO_TXT)); + assert(!(r->user_flags & CATTA_LOOKUP_NO_TXT)); if (!r->txt_record) { - r->txt_record = avahi_record_ref(record); + r->txt_record = catta_record_ref(record); changed = 1; } break; - case AVAHI_DNS_TYPE_A: - case AVAHI_DNS_TYPE_AAAA: + case CATTA_DNS_TYPE_A: + case CATTA_DNS_TYPE_AAAA: - assert(!(r->user_flags & AVAHI_LOOKUP_NO_ADDRESS)); + assert(!(r->user_flags & CATTA_LOOKUP_NO_ADDRESS)); if (!r->address_record) { - r->address_record = avahi_record_ref(record); + r->address_record = catta_record_ref(record); changed = 1; } break; @@ -263,70 +263,70 @@ static void record_browser_callback( if (changed && r->srv_record && - (r->txt_record || (r->user_flags & AVAHI_LOOKUP_NO_TXT)) && - (r->address_record || (r->user_flags & AVAHI_LOOKUP_NO_ADDRESS))) - finish(r, AVAHI_RESOLVER_FOUND); + (r->txt_record || (r->user_flags & CATTA_LOOKUP_NO_TXT)) && + (r->address_record || (r->user_flags & CATTA_LOOKUP_NO_ADDRESS))) + finish(r, CATTA_RESOLVER_FOUND); break; } - case AVAHI_BROWSER_REMOVE: + case CATTA_BROWSER_REMOVE: assert(record); switch (record->key->type) { - case AVAHI_DNS_TYPE_SRV: + case CATTA_DNS_TYPE_SRV: - if (r->srv_record && avahi_record_equal_no_ttl(record, r->srv_record)) { - avahi_record_unref(r->srv_record); + if (r->srv_record && catta_record_equal_no_ttl(record, r->srv_record)) { + catta_record_unref(r->srv_record); r->srv_record = NULL; if (r->record_browser_a) { - avahi_s_record_browser_free(r->record_browser_a); + catta_s_record_browser_free(r->record_browser_a); r->record_browser_a = NULL; } if (r->record_browser_aaaa) { - avahi_s_record_browser_free(r->record_browser_aaaa); + catta_s_record_browser_free(r->record_browser_aaaa); r->record_browser_aaaa = NULL; } /** Look for a replacement */ - avahi_s_record_browser_restart(r->record_browser_srv); + catta_s_record_browser_restart(r->record_browser_srv); start_timeout(r); } break; - case AVAHI_DNS_TYPE_TXT: + case CATTA_DNS_TYPE_TXT: - assert(!(r->user_flags & AVAHI_LOOKUP_NO_TXT)); + assert(!(r->user_flags & CATTA_LOOKUP_NO_TXT)); - if (r->txt_record && avahi_record_equal_no_ttl(record, r->txt_record)) { - avahi_record_unref(r->txt_record); + if (r->txt_record && catta_record_equal_no_ttl(record, r->txt_record)) { + catta_record_unref(r->txt_record); r->txt_record = NULL; /** Look for a replacement */ - avahi_s_record_browser_restart(r->record_browser_txt); + catta_s_record_browser_restart(r->record_browser_txt); start_timeout(r); } break; - case AVAHI_DNS_TYPE_A: - case AVAHI_DNS_TYPE_AAAA: + case CATTA_DNS_TYPE_A: + case CATTA_DNS_TYPE_AAAA: - assert(!(r->user_flags & AVAHI_LOOKUP_NO_ADDRESS)); + assert(!(r->user_flags & CATTA_LOOKUP_NO_ADDRESS)); - if (r->address_record && avahi_record_equal_no_ttl(record, r->address_record)) { - avahi_record_unref(r->address_record); + if (r->address_record && catta_record_equal_no_ttl(record, r->address_record)) { + catta_record_unref(r->address_record); r->address_record = NULL; /** Look for a replacement */ if (r->record_browser_aaaa) - avahi_s_record_browser_restart(r->record_browser_aaaa); + catta_s_record_browser_restart(r->record_browser_aaaa); if (r->record_browser_a) - avahi_s_record_browser_restart(r->record_browser_a); + catta_s_record_browser_restart(r->record_browser_a); start_timeout(r); } break; @@ -337,22 +337,22 @@ static void record_browser_callback( break; - case AVAHI_BROWSER_CACHE_EXHAUSTED: - case AVAHI_BROWSER_ALL_FOR_NOW: + case CATTA_BROWSER_CACHE_EXHAUSTED: + case CATTA_BROWSER_ALL_FOR_NOW: break; - case AVAHI_BROWSER_FAILURE: + case CATTA_BROWSER_FAILURE: if (rr == r->record_browser_a && r->record_browser_aaaa) { /* We were looking for both AAAA and A, and the other query is still living, so we'll not die */ - avahi_s_record_browser_free(r->record_browser_a); + catta_s_record_browser_free(r->record_browser_a); r->record_browser_a = NULL; break; } if (rr == r->record_browser_aaaa && r->record_browser_a) { /* We were looking for both AAAA and A, and the other query is still living, so we'll not die */ - avahi_s_record_browser_free(r->record_browser_aaaa); + catta_s_record_browser_free(r->record_browser_aaaa); r->record_browser_aaaa = NULL; break; } @@ -360,95 +360,95 @@ static void record_browser_callback( /* Hmm, everything's lost, tell the user */ if (r->record_browser_srv) - avahi_s_record_browser_free(r->record_browser_srv); + catta_s_record_browser_free(r->record_browser_srv); if (r->record_browser_txt) - avahi_s_record_browser_free(r->record_browser_txt); + catta_s_record_browser_free(r->record_browser_txt); if (r->record_browser_a) - avahi_s_record_browser_free(r->record_browser_a); + catta_s_record_browser_free(r->record_browser_a); if (r->record_browser_aaaa) - avahi_s_record_browser_free(r->record_browser_aaaa); + catta_s_record_browser_free(r->record_browser_aaaa); r->record_browser_srv = r->record_browser_txt = r->record_browser_a = r->record_browser_aaaa = NULL; - finish(r, AVAHI_RESOLVER_FAILURE); + finish(r, CATTA_RESOLVER_FAILURE); break; } } -AvahiSServiceResolver *avahi_s_service_resolver_new( - AvahiServer *server, - AvahiIfIndex interface, - AvahiProtocol protocol, +CattaSServiceResolver *catta_s_service_resolver_new( + CattaServer *server, + CattaIfIndex iface, + CattaProtocol protocol, const char *name, const char *type, const char *domain, - AvahiProtocol aprotocol, - AvahiLookupFlags flags, - AvahiSServiceResolverCallback callback, + CattaProtocol aprotocol, + CattaLookupFlags flags, + CattaSServiceResolverCallback callback, void* userdata) { - AvahiSServiceResolver *r; - AvahiKey *k; - char n[AVAHI_DOMAIN_NAME_MAX]; + CattaSServiceResolver *r; + CattaKey *k; + char n[CATTA_DOMAIN_NAME_MAX]; int ret; assert(server); assert(type); assert(callback); - AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_IF_VALID(interface), AVAHI_ERR_INVALID_INTERFACE); - AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL); - AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(aprotocol), AVAHI_ERR_INVALID_PROTOCOL); - AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME); - AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !name || avahi_is_valid_service_name(name), AVAHI_ERR_INVALID_SERVICE_NAME); - AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type_strict(type), AVAHI_ERR_INVALID_SERVICE_TYPE); - AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST|AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), AVAHI_ERR_INVALID_FLAGS); + CATTA_CHECK_VALIDITY_RETURN_NULL(server, CATTA_IF_VALID(iface), CATTA_ERR_INVALID_INTERFACE); + CATTA_CHECK_VALIDITY_RETURN_NULL(server, CATTA_PROTO_VALID(protocol), CATTA_ERR_INVALID_PROTOCOL); + CATTA_CHECK_VALIDITY_RETURN_NULL(server, CATTA_PROTO_VALID(aprotocol), CATTA_ERR_INVALID_PROTOCOL); + CATTA_CHECK_VALIDITY_RETURN_NULL(server, !domain || catta_is_valid_domain_name(domain), CATTA_ERR_INVALID_DOMAIN_NAME); + CATTA_CHECK_VALIDITY_RETURN_NULL(server, !name || catta_is_valid_service_name(name), CATTA_ERR_INVALID_SERVICE_NAME); + CATTA_CHECK_VALIDITY_RETURN_NULL(server, catta_is_valid_service_type_strict(type), CATTA_ERR_INVALID_SERVICE_TYPE); + CATTA_CHECK_VALIDITY_RETURN_NULL(server, CATTA_FLAGS_VALID(flags, CATTA_LOOKUP_USE_WIDE_AREA|CATTA_LOOKUP_USE_MULTICAST|CATTA_LOOKUP_NO_TXT|CATTA_LOOKUP_NO_ADDRESS), CATTA_ERR_INVALID_FLAGS); if (!domain) domain = server->domain_name; - if ((ret = avahi_service_name_join(n, sizeof(n), name, type, domain)) < 0) { - avahi_server_set_errno(server, ret); + if ((ret = catta_service_name_join(n, sizeof(n), name, type, domain)) < 0) { + catta_server_set_errno(server, ret); return NULL; } - if (!(r = avahi_new(AvahiSServiceResolver, 1))) { - avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY); + if (!(r = catta_new(CattaSServiceResolver, 1))) { + catta_server_set_errno(server, CATTA_ERR_NO_MEMORY); return NULL; } r->server = server; - r->service_name = avahi_strdup(name); - r->service_type = avahi_normalize_name_strdup(type); - r->domain_name = avahi_normalize_name_strdup(domain); + r->service_name = catta_strdup(name); + r->service_type = catta_normalize_name_strdup(type); + r->domain_name = catta_normalize_name_strdup(domain); r->callback = callback; r->userdata = userdata; r->address_protocol = aprotocol; r->srv_record = r->txt_record = r->address_record = NULL; r->srv_flags = r->txt_flags = r->address_flags = 0; - r->interface = interface; + r->iface = iface; r->protocol = protocol; r->user_flags = flags; r->record_browser_a = r->record_browser_aaaa = r->record_browser_srv = r->record_browser_txt = NULL; r->time_event = NULL; - AVAHI_LLIST_PREPEND(AvahiSServiceResolver, resolver, server->service_resolvers, r); + CATTA_LLIST_PREPEND(CattaSServiceResolver, resolver, server->service_resolvers, r); - k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV); - r->record_browser_srv = avahi_s_record_browser_new(server, interface, protocol, k, flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); - avahi_key_unref(k); + k = catta_key_new(n, CATTA_DNS_CLASS_IN, CATTA_DNS_TYPE_SRV); + r->record_browser_srv = catta_s_record_browser_new(server, iface, protocol, k, flags & ~(CATTA_LOOKUP_NO_TXT|CATTA_LOOKUP_NO_ADDRESS), record_browser_callback, r); + catta_key_unref(k); if (!r->record_browser_srv) { - avahi_s_service_resolver_free(r); + catta_s_service_resolver_free(r); return NULL; } - if (!(flags & AVAHI_LOOKUP_NO_TXT)) { - k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT); - r->record_browser_txt = avahi_s_record_browser_new(server, interface, protocol, k, flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); - avahi_key_unref(k); + if (!(flags & CATTA_LOOKUP_NO_TXT)) { + k = catta_key_new(n, CATTA_DNS_CLASS_IN, CATTA_DNS_TYPE_TXT); + r->record_browser_txt = catta_s_record_browser_new(server, iface, protocol, k, flags & ~(CATTA_LOOKUP_NO_TXT|CATTA_LOOKUP_NO_ADDRESS), record_browser_callback, r); + catta_key_unref(k); if (!r->record_browser_txt) { - avahi_s_service_resolver_free(r); + catta_s_service_resolver_free(r); return NULL; } } @@ -458,32 +458,32 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( return r; } -void avahi_s_service_resolver_free(AvahiSServiceResolver *r) { +void catta_s_service_resolver_free(CattaSServiceResolver *r) { assert(r); - AVAHI_LLIST_REMOVE(AvahiSServiceResolver, resolver, r->server->service_resolvers, r); + CATTA_LLIST_REMOVE(CattaSServiceResolver, resolver, r->server->service_resolvers, r); if (r->time_event) - avahi_time_event_free(r->time_event); + catta_time_event_free(r->time_event); if (r->record_browser_srv) - avahi_s_record_browser_free(r->record_browser_srv); + catta_s_record_browser_free(r->record_browser_srv); if (r->record_browser_txt) - avahi_s_record_browser_free(r->record_browser_txt); + catta_s_record_browser_free(r->record_browser_txt); if (r->record_browser_a) - avahi_s_record_browser_free(r->record_browser_a); + catta_s_record_browser_free(r->record_browser_a); if (r->record_browser_aaaa) - avahi_s_record_browser_free(r->record_browser_aaaa); + catta_s_record_browser_free(r->record_browser_aaaa); if (r->srv_record) - avahi_record_unref(r->srv_record); + catta_record_unref(r->srv_record); if (r->txt_record) - avahi_record_unref(r->txt_record); + catta_record_unref(r->txt_record); if (r->address_record) - avahi_record_unref(r->address_record); + catta_record_unref(r->address_record); - avahi_free(r->service_name); - avahi_free(r->service_type); - avahi_free(r->domain_name); - avahi_free(r); + catta_free(r->service_name); + catta_free(r->service_type); + catta_free(r->domain_name); + catta_free(r); }