X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fcore-browse-services.c;h=53b18eeebb7936191e6561c7ebb6b6a611b6a9ad;hb=0456242ed7e6ad6bb2afd2f8210e86dfa80ab9d2;hp=8df5454f0ebd158f1cc2f5845e3656de150a9b8d;hpb=b6306c88b9279d8194afa85a6497c39531b3bfa9;p=catta diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c index 8df5454..53b18ee 100644 --- a/examples/core-browse-services.c +++ b/examples/core-browse-services.c @@ -5,7 +5,7 @@ * the embeddable mDNS stack for embedded applications. * * End user applications should *not* use this API and should use - * the DBUS or C APIs, please see + * the D-Bus or C APIs, please see * client-browse-services.c and glib-integration.c * * I repeat, you probably do *not* want to use this example. @@ -40,16 +40,18 @@ #include #include +#include #include #include #include static AvahiSimplePoll *simple_poll = NULL; +static AvahiServer *server = NULL; static void resolve_callback( AvahiSServiceResolver *r, - AvahiIfIndex interface, - AvahiProtocol protocol, + AVAHI_GCC_UNUSED AvahiIfIndex interface, + AVAHI_GCC_UNUSED AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const char *type, @@ -58,27 +60,44 @@ static void resolve_callback( const AvahiAddress *address, uint16_t port, AvahiStringList *txt, - void* userdata) { + AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED 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); + switch (event) { + case AVAHI_RESOLVER_FAILURE: + fprintf(stderr, "(Resolver) Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", name, type, domain, avahi_strerror(avahi_server_errno(server))); + break; - avahi_address_snprint(a, sizeof(a), address); - t = avahi_string_list_to_string(txt); - fprintf(stderr, "\t%s:%u (%s) TXT=%s (cookie is %u)\n", host_name, port, a, t, avahi_string_list_get_service_cookie(txt)); - avahi_free(t); + case AVAHI_RESOLVER_FOUND: { + char a[AVAHI_ADDRESS_STR_MAX], *t; + + fprintf(stderr, "(Resolver) 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), + !!(flags & AVAHI_LOOKUP_RESULT_LOCAL), + !!(flags & AVAHI_LOOKUP_RESULT_WIDE_AREA), + !!(flags & AVAHI_LOOKUP_RESULT_MULTICAST), + !!(flags & AVAHI_LOOKUP_RESULT_CACHED)); + avahi_free(t); + } } - + avahi_s_service_resolver_free(r); } @@ -90,6 +109,7 @@ static void browse_callback( const char *name, const char *type, const char *domain, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void* userdata) { AvahiServer *s = userdata; @@ -97,27 +117,41 @@ static void browse_callback( /* 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: + + fprintf(stderr, "(Browser) %s\n", avahi_strerror(avahi_server_errno(server))); + 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[]) { +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) { AvahiServerConfig config; - AvahiServer *server = NULL; - AvahiSServiceBrowser *sb; + AvahiSServiceBrowser *sb = NULL; int error; int ret = 1; @@ -136,6 +170,11 @@ 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); @@ -150,15 +189,13 @@ int main(int argc, char*argv[]) { } /* 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; } /* Run the main loop */ - for (;;) - if (avahi_simple_poll_iterate(simple_poll, -1) != 0) - break; + avahi_simple_poll_loop(simple_poll); ret = 0;