From 6b391bb81f0dce0193a722254016b26c12a17643 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 18 Oct 2005 19:52:03 +0000 Subject: * remove AVAHI_PUBLISH_IS_PROXY, it was a bad idea * drop avahi_service_is_service_local(), avahi_client_is_service_local() * add new lookup result flags AVAHI_LOOKUP_RESULT_OUR_OWN and AVAHI_LOOKUP_RESULT_LOCAL * remove avahi_address_resolver_new() and replace it by avahi_address_resolver_new_a() * avahi-client: save query data in browse/resolve objects so that we can return it on failure * other cleanups git-svn-id: file:///home/lennart/svn/public/avahi/trunk@811 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- examples/client-browse-services.c | 10 +++++----- examples/client-publish-service.c | 24 +++++++++++------------- examples/core-browse-services.c | 6 ++---- examples/core-publish-service.c | 19 ++++++++----------- 4 files changed, 26 insertions(+), 33 deletions(-) (limited to 'examples') diff --git a/examples/client-browse-services.c b/examples/client-browse-services.c index 3bbed11..5ebbf2d 100644 --- a/examples/client-browse-services.c +++ b/examples/client-browse-services.c @@ -73,13 +73,15 @@ static void resolve_callback( "\tTXT=%s\n" "\tcookie is %u\n" "\tis_local: %i\n" + "\tour_own: %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_RESULT_LOCAL), + !!(flags & AVAHI_LOOKUP_RESULT_OUR_OWN), !!(flags & AVAHI_LOOKUP_RESULT_WIDE_AREA), !!(flags & AVAHI_LOOKUP_RESULT_MULTICAST), !!(flags & AVAHI_LOOKUP_RESULT_CACHED)); @@ -176,11 +178,9 @@ int main(int argc, char*argv[]) { fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client))); 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; diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c index e9dcffc..bb895ce 100644 --- a/examples/client-publish-service.c +++ b/examples/client-publish-service.c @@ -72,15 +72,14 @@ static void create_services(AvahiClient *c) { assert(c); /* If this is the first time we're called, let's create a new entry group */ - if (!group) { + if (!group) if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) { fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_client_errno(c))); goto fail; } - } fprintf(stderr, "Adding service '%s'\n", name); - + /* Create some random TXT data */ snprintf(r, sizeof(r), "random=%i", rand()); @@ -120,12 +119,15 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void * userd /* Called whenever the client or server state changes */ - if (state == AVAHI_CLIENT_S_RUNNING) - /* The serve has startup successfully and registered its host + if (state == AVAHI_CLIENT_S_RUNNING) { + + /* The server has startup successfully and registered its host * name on the network, so it's time to create our services */ - create_services(c); + if (group) + create_services(c); - else if (state == AVAHI_CLIENT_S_COLLISION) { + } else if (state == AVAHI_CLIENT_S_COLLISION) { + /* Let's drop our registered services. When the server is back * in AVAHI_SERVER_RUNNING state we will register them * again with the new host name. */ @@ -160,19 +162,15 @@ int main(int argc, char*argv[]) { fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error)); 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; fail: /* Cleanup things */ - if (group) - avahi_entry_group_free(group); if (client) avahi_client_free(client); diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c index 57fafe4..db2dcb9 100644 --- a/examples/core-browse-services.c +++ b/examples/core-browse-services.c @@ -90,7 +90,7 @@ static void resolve_callback( 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_RESULT_LOCAL), !!(flags & AVAHI_LOOKUP_RESULT_WIDE_AREA), !!(flags & AVAHI_LOOKUP_RESULT_MULTICAST), !!(flags & AVAHI_LOOKUP_RESULT_CACHED)); @@ -195,9 +195,7 @@ int main(int argc, char*argv[]) { } /* Run the main loop */ - for (;;) - if (avahi_simple_poll_iterate(simple_poll, -1) != 0) - break; + avahi_simple_poll_loop(simple_poll); ret = 0; diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c index f826a5f..0d8c04c 100644 --- a/examples/core-publish-service.c +++ b/examples/core-publish-service.c @@ -72,12 +72,11 @@ static void create_services(AvahiServer *s) { assert(s); /* If this is the first time we're called, let's create a new entry group */ - if (!group) { + if (!group) if (!(group = avahi_s_entry_group_new(s, entry_group_callback, NULL))) { fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); goto fail; } - } fprintf(stderr, "Adding service '%s'\n", name); @@ -120,12 +119,14 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void * userd /* Called whenever the server state changes */ - if (state == AVAHI_SERVER_RUNNING) + if (state == AVAHI_SERVER_RUNNING) { /* The serve has startup successfully and registered its host * name on the network, so it's time to create our services */ - create_services(s); + + if (group) + create_services(s); - else if (state == AVAHI_SERVER_COLLISION) { + } else if (state == AVAHI_SERVER_COLLISION) { char *n; int r; @@ -183,19 +184,15 @@ int main(int argc, char*argv[]) { fprintf(stderr, "Failed to create server: %s\n", avahi_strerror(error)); 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; fail: /* Cleanup things */ - if (group) - avahi_s_entry_group_free(group); if (server) avahi_server_free(server); -- cgit