const AvahiAddress *address,
uint16_t port,
AvahiStringList *txt,
+ AvahiLookupResultFlags flags,
void* userdata) {
assert(r);
/* Called whenever a service has been resolved successfully or timed out */
- if (event == AVAHI_RESOLVER_TIMEOUT)
- fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s'.\n", name, type, domain);
- else {
- char a[128], *t;
-
- assert(event == AVAHI_RESOLVER_FOUND);
-
- fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
-
- avahi_address_snprint(a, sizeof(a), address);
- t = avahi_string_list_to_string(txt);
- fprintf(stderr,
- "\t%s:%u (%s)\n"
- "\tTXT=%s\n"
- "\tcookie is %u\n"
- "\tis_local: %i\n",
- host_name, port, a,
- t,
- avahi_string_list_get_service_cookie(txt),
- avahi_client_is_service_local(avahi_service_resolver_get_client(r), interface, protocol, name, type, domain));
- avahi_free(t);
+ switch (event) {
+ case AVAHI_RESOLVER_TIMEOUT:
+ case AVAHI_RESOLVER_NOT_FOUND:
+ case AVAHI_RESOLVER_FAILURE:
+ fprintf(stderr, "(Resolver) Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", name, type, domain,
+ event == AVAHI_RESOLVER_TIMEOUT ? "TIMEOUT" : (event == AVAHI_RESOLVER_NOT_FOUND ? "NOT_FOUND" : "FAILURE"));
+
+
+ case AVAHI_RESOLVER_FOUND: {
+ char a[128], *t;
+
+ fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
+
+ avahi_address_snprint(a, sizeof(a), address);
+ t = avahi_string_list_to_string(txt);
+ fprintf(stderr,
+ "\t%s:%u (%s)\n"
+ "\tTXT=%s\n"
+ "\tcookie is %u\n"
+ "\tis_local: %i\n"
+ "\twide_area: %i\n"
+ "\tmulticast: %i\n"
+ "\tcached: %i\n",
+ host_name, port, a,
+ t,
+ avahi_string_list_get_service_cookie(txt),
+ avahi_client_is_service_local(avahi_service_resolver_get_client(r), interface, protocol, name, type, domain),
+ !!(flags & AVAHI_LOOKUP_CALLBACK_WIDE_AREA),
+ !!(flags & AVAHI_LOOKUP_CALLBACK_MULTICAST),
+ !!(flags & AVAHI_LOOKUP_CALLBACK_CACHED));
+
+ avahi_free(t);
+ }
}
avahi_service_resolver_free(r);
const char *name,
const char *type,
const char *domain,
+ AvahiLookupResultFlags flags,
void* userdata) {
AvahiClient *c = userdata;
/* Called whenever a new services becomes available on the LAN or is removed from the LAN */
- fprintf(stderr, "%s: service '%s' of type '%s' in domain '%s'\n",
- event == AVAHI_BROWSER_NEW ? "NEW" : "REMOVED",
- name,
- type,
- domain);
-
- /* If it's new, let's resolve it */
- if (event == AVAHI_BROWSER_NEW)
-
- /* We ignore the returned resolver object. In the callback function
- we free it. If the server is terminated before the callback
- function is called the server will free the resolver for us. */
-
- if (!(avahi_service_resolver_new(c, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, resolve_callback, c)))
- fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_client_errno(c)));
+ switch (event) {
+ case AVAHI_BROWSER_FAILURE:
+ case AVAHI_BROWSER_NOT_FOUND:
+
+ fprintf(stderr, "(Browser) %s\n", event == AVAHI_BROWSER_FAILURE ? "FAILURE" : "NOT_FOUND");
+ avahi_simple_poll_quit(simple_poll);
+ return;
+
+ case AVAHI_BROWSER_NEW:
+ fprintf(stderr, "(Browser) NEW: service '%s' of type '%s' in domain '%s'\n", name, type, domain);
+
+ /* We ignore the returned resolver object. In the callback
+ function we free it. If the server is terminated before
+ the callback function is called the server will free
+ the resolver for us. */
+
+ if (!(avahi_service_resolver_new(c, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, 0, resolve_callback, c)))
+ fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_client_errno(c)));
+
+ break;
+
+ case AVAHI_BROWSER_REMOVE:
+ fprintf(stderr, "(Browser) REMOVE: service '%s' of type '%s' in domain '%s'\n", name, type, domain);
+ break;
+
+ case AVAHI_BROWSER_ALL_FOR_NOW:
+ case AVAHI_BROWSER_CACHE_EXHAUSTED:
+ fprintf(stderr, "(Browser) %s\n", event == AVAHI_BROWSER_CACHE_EXHAUSTED ? "CACHE_EXHAUSTED" : "ALL_FOR_NOW");
+ break;
+
+ }
}
static void client_callback(AvahiClient *c, AvahiClientState state, void * userdata) {
int main(int argc, char*argv[]) {
AvahiClient *client = NULL;
- AvahiServiceBrowser *sb;
+ AvahiServiceBrowser *sb = NULL;
int error;
int ret = 1;
}
/* Create the service browser */
- if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, browse_callback, client))) {
+ if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, 0, browse_callback, client))) {
fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client)));
goto fail;
}
#include <time.h>
#include <avahi-core/core.h>
+#include <avahi-core/lookup.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/malloc.h>
#include <avahi-common/error.h>
const AvahiAddress *address,
uint16_t port,
AvahiStringList *txt,
+ AvahiLookupResultFlags flags,
void* userdata) {
assert(r);
/* Called whenever a service has been resolved successfully or timed out */
- if (event == AVAHI_RESOLVER_TIMEOUT)
- fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s'.\n", name, type, domain);
- else {
- char a[128], *t;
-
- assert(event == AVAHI_RESOLVER_FOUND);
-
- fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
-
- avahi_address_snprint(a, sizeof(a), address);
- t = avahi_string_list_to_string(txt);
- fprintf(stderr,
- "\t%s:%u (%s)\n"
- "\tTXT=%s\n"
- "\tcookie is %u\n"
- "\tis_local: %i\n",
- host_name, port, a,
- t,
- avahi_string_list_get_service_cookie(txt),
- avahi_server_is_service_local(server, interface, protocol, name, type, domain));
- avahi_free(t);
+ switch (event) {
+ case AVAHI_RESOLVER_TIMEOUT:
+ case AVAHI_RESOLVER_NOT_FOUND:
+ case AVAHI_RESOLVER_FAILURE:
+ fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", name, type, domain,
+ event == AVAHI_RESOLVER_TIMEOUT ? "TIMEOUT" : (event == AVAHI_RESOLVER_NOT_FOUND ? "NOT_FOUND" : "FAILURE"));
+
+ case AVAHI_RESOLVER_FOUND: {
+ char a[128], *t;
+
+ fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
+
+ avahi_address_snprint(a, sizeof(a), address);
+ t = avahi_string_list_to_string(txt);
+ fprintf(stderr,
+ "\t%s:%u (%s)\n"
+ "\tTXT=%s\n"
+ "\tcookie is %u\n"
+ "\tis_local: %i\n"
+ "\twide_area: %i\n"
+ "\tmulticast: %i\n"
+ "\tcached: %i\n",
+ host_name, port, a,
+ t,
+ avahi_string_list_get_service_cookie(txt),
+ avahi_server_is_service_local(server, interface, protocol, name, type, domain),
+ !!(flags & AVAHI_LOOKUP_CALLBACK_WIDE_AREA),
+ !!(flags & AVAHI_LOOKUP_CALLBACK_MULTICAST),
+ !!(flags & AVAHI_LOOKUP_CALLBACK_CACHED));
+ avahi_free(t);
+ }
}
-
+
avahi_s_service_resolver_free(r);
}
const char *name,
const char *type,
const char *domain,
+ AvahiLookupResultFlags flags,
void* userdata) {
AvahiServer *s = userdata;
/* Called whenever a new services becomes available on the LAN or is removed from the LAN */
- fprintf(stderr, "%s: service '%s' of type '%s' in domain '%s'\n",
- event == AVAHI_BROWSER_NEW ? "NEW" : "REMOVED",
- name,
- type,
- domain);
-
- /* If it's new, let's resolve it */
- if (event == AVAHI_BROWSER_NEW)
-
- /* We ignore the returned resolver object. In the callback function
- we free it. If the server is terminated before the callback
- function is called the server will free the resolver for us. */
-
- if (!(avahi_s_service_resolver_new(s, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, resolve_callback, s)))
- fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_server_errno(s)));
+ switch (event) {
+
+ case AVAHI_BROWSER_FAILURE:
+ case AVAHI_BROWSER_NOT_FOUND:
+
+ fprintf(stderr, "(Browser) %s\n", event == AVAHI_BROWSER_FAILURE ? "FAILURE" : "NOT_FOUND");
+ avahi_simple_poll_quit(simple_poll);
+ return;
+
+ case AVAHI_BROWSER_NEW:
+ fprintf(stderr, "(Browser) NEW: service '%s' of type '%s' in domain '%s'\n", name, type, domain);
+
+ /* We ignore the returned resolver object. In the callback
+ function we free it. If the server is terminated before
+ the callback function is called the server will free
+ the resolver for us. */
+
+ if (!(avahi_s_service_resolver_new(s, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, 0, resolve_callback, s)))
+ fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_server_errno(s)));
+
+ break;
+
+ case AVAHI_BROWSER_REMOVE:
+ fprintf(stderr, "(Browser) REMOVE: service '%s' of type '%s' in domain '%s'\n", name, type, domain);
+ break;
+
+ case AVAHI_BROWSER_ALL_FOR_NOW:
+ case AVAHI_BROWSER_CACHE_EXHAUSTED:
+ fprintf(stderr, "(Browser) %s\n", event == AVAHI_BROWSER_CACHE_EXHAUSTED ? "CACHE_EXHAUSTED" : "ALL_FOR_NOW");
+ break;
+ }
}
int main(int argc, char*argv[]) {
config.publish_addresses = 0;
config.publish_workstation = 0;
config.publish_domain = 0;
+
+ /* Set a unicast DNS server for wide area DNS-SD */
+ avahi_address_parse("192.168.50.1", AVAHI_PROTO_UNSPEC, &config.wide_area_servers[0]);
+ config.n_wide_area_servers = 1;
+ config.enable_wide_area = 1;
/* Allocate a new server */
server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, NULL, NULL, &error);
}
/* Create the service browser */
- if (!(sb = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, browse_callback, server))) {
+ if (!(sb = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, 0, browse_callback, server))) {
fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_server_errno(server)));
goto fail;
}
projects / catta / commitdiff