X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-service.c;h=1ad60780a9c9843b7e9a69799f89d63216f2f46a;hb=d7a988b459bedde8ebd2a34d954c2c1836c5a5f8;hp=de347e278d56bb58a3acc0c32a3970295919ff8d;hpb=1f8fae6b40c9289d97a025375f04009a5fa2ba3e;p=catta diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c index de347e2..1ad6078 100644 --- a/avahi-core/resolve-service.c +++ b/avahi-core/resolve-service.c @@ -81,8 +81,6 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) { switch (event) { case AVAHI_RESOLVER_FAILURE: - case AVAHI_RESOLVER_NOT_FOUND: - case AVAHI_RESOLVER_TIMEOUT: r->callback( r, @@ -133,7 +131,7 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) { r->service_name, r->service_type, r->domain_name, - r->address_record ? r->address_record->key->name : r->srv_record->data.srv.name, + r->srv_record->data.srv.name, r->address_record ? &a : NULL, r->srv_record->data.srv.port, r->txt_record ? r->txt_record->data.txt.string_list : NULL, @@ -151,9 +149,8 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) { assert(e); assert(r); - avahi_log_debug("timeout"); - - finish(r, AVAHI_RESOLVER_TIMEOUT); + avahi_server_set_errno(r->server, AVAHI_ERR_TIMEOUT); + finish(r, AVAHI_RESOLVER_FAILURE); } static void start_timeout(AvahiSServiceResolver *r) { @@ -346,9 +343,7 @@ static void record_browser_callback( case AVAHI_BROWSER_ALL_FOR_NOW: break; - case AVAHI_BROWSER_NOT_FOUND: case AVAHI_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 */ @@ -364,7 +359,6 @@ static void record_browser_callback( break; } - /* Hmm, everything's lost, tell the user */ if (r->record_browser_srv) @@ -378,7 +372,7 @@ static void record_browser_callback( r->record_browser_srv = r->record_browser_txt = r->record_browser_a = r->record_browser_aaaa = NULL; - finish(r, event == AVAHI_BROWSER_FAILURE ? AVAHI_RESOLVER_FAILURE : AVAHI_RESOLVER_NOT_FOUND); + finish(r, AVAHI_RESOLVER_FAILURE); break; } } @@ -397,40 +391,26 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( AvahiSServiceResolver *r; AvahiKey *k; - char t[256]; + char n[AVAHI_DOMAIN_NAME_MAX]; int ret; assert(server); assert(type); assert(callback); - assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6); - - if (!AVAHI_IF_VALID(interface)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_INTERFACE); - return NULL; - } - - if (name && !avahi_is_valid_service_name(name)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_NAME); - return NULL; - } - - if (!avahi_is_valid_service_type(type)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_TYPE); - return NULL; - } - - if (domain && !avahi_is_valid_domain_name(domain)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME); - return NULL; - } + 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); if (!domain) domain = server->domain_name; - - if (!AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST|AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS)) { - avahi_server_set_errno(server, AVAHI_ERR_INVALID_FLAGS); + + if ((ret = avahi_service_name_join(n, sizeof(n), name, type, domain)) < 0) { + avahi_server_set_errno(server, ret); return NULL; } @@ -441,8 +421,8 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( r->server = server; r->service_name = avahi_strdup(name); - r->service_type = avahi_normalize_name(type); - r->domain_name = avahi_normalize_name(domain); + r->service_type = avahi_normalize_name_strdup(type); + r->domain_name = avahi_normalize_name_strdup(domain); r->callback = callback; r->userdata = userdata; r->address_protocol = aprotocol; @@ -455,13 +435,7 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( r->time_event = NULL; AVAHI_LLIST_PREPEND(AvahiSServiceResolver, resolver, server->service_resolvers, r); - if ((ret = avahi_service_name_snprint(t, sizeof(t), name, r->service_type, r->domain_name)) < 0) { - avahi_server_set_errno(server, ret); - avahi_s_service_resolver_free(r); - return NULL; - } - - k = avahi_key_new(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV); + 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); @@ -471,7 +445,7 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( } if (!(flags & AVAHI_LOOKUP_NO_TXT)) { - k = avahi_key_new(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_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);