X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fconformance-test.c;h=632f66b626a6671b5d6690a8c5e6ea1c3f3a737c;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=fab9b5641414e58eca822760d495bba8426b5f49;hpb=769c00f228ba0d37217aaf1424dedde390e7a01c;p=catta diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c index fab9b56..632f66b 100644 --- a/avahi-core/conformance-test.c +++ b/avahi-core/conformance-test.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi 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 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 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -23,33 +21,43 @@ #include #endif -#include -#include -#include #include #include #include #include +#include +#include +#include +#include + #include -#include -#include +#include +#include +#include -#include "core.h" -#include "log.h" +#include +#include +#include +#include static char *name = NULL; static AvahiSEntryGroup *group = NULL; static int try = 0; static AvahiServer *avahi = NULL; +static const AvahiPoll *poll_api; -static void dump_line(const char *text, void* userdata) { +static void dump_line(const char *text, AVAHI_GCC_UNUSED void* userdata) { printf("%s\n", text); } -static int dump_timeout(void* data) { +static void dump_timeout_callback(AvahiTimeout *timeout, AVAHI_GCC_UNUSED void* userdata) { + struct timeval tv; + avahi_server_dump(avahi, dump_line, NULL); - return 1; + + avahi_elapse_time(&tv, 5000, 0); + poll_api->timeout_update(timeout, &tv); } static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* userdata); @@ -59,7 +67,7 @@ static void create_service(const char *t) { assert(t || name); - n = t ? g_strdup(t) : avahi_alternative_service_name(name); + n = t ? avahi_strdup(t) : avahi_alternative_service_name(name); avahi_free(name); name = n; @@ -67,24 +75,26 @@ static void create_service(const char *t) { avahi_s_entry_group_reset(group); else group = avahi_s_entry_group_new(avahi, entry_group_callback, NULL); - - avahi_server_add_service(avahi, group, 0, AF_UNSPEC, name, "_http._tcp", NULL, NULL, 80, "foo", NULL); + + avahi_server_add_service(avahi, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_http._tcp", NULL, NULL, 80, "foo", NULL); avahi_s_entry_group_commit(group); try++; } -static int rename_timeout(void* data) { - - if (access("flag", F_OK) == 0) { +static void rename_timeout_callback(AvahiTimeout *timeout, AVAHI_GCC_UNUSED void *userdata) { + struct timeval tv; + + if (access("flag", F_OK) == 0) { create_service("New - Bonjour Service Name"); - return 0; + return; } - return 1; + avahi_elapse_time(&tv, 5000, 0); + poll_api->timeout_update(timeout, &tv); } -static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* userdata) { +static void entry_group_callback(AVAHI_GCC_UNUSED AvahiServer *s, AVAHI_GCC_UNUSED AvahiSEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void* userdata) { if (state == AVAHI_ENTRY_GROUP_COLLISION) create_service(NULL); else if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) { @@ -93,37 +103,56 @@ static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntry } } -static void server_callback(AvahiServer *s, AvahiServerState state, void* userdata) { +static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UNUSED void* userdata) { avahi_log_debug("server state: %i", state); if (state == AVAHI_SERVER_RUNNING) { - create_service("gurke"); avahi_server_dump(avahi, dump_line, NULL); + } else if (state == AVAHI_SERVER_COLLISION) { + char *n; + + n = avahi_alternative_host_name(avahi_server_get_host_name(s)); + avahi_log_warn("Host name conflict, retrying with <%s>", n); + avahi_server_set_host_name(s, n); + avahi_free(n); + } } -int main(int argc, char *argv[]) { - GMainLoop *loop = NULL; - gint error; - AvahiGLibPoll *glib_poll; +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + int error; + AvahiSimplePoll *simple_poll; + struct timeval tv; + struct AvahiServerConfig config; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); - avahi_set_allocator(avahi_glib_allocator()); + avahi_server_config_init(&config); + config.publish_workstation = 0; + config.use_ipv6 = 0; + config.publish_domain = 0; + config.publish_hinfo = 0; + avahi = avahi_server_new(poll_api, &config, server_callback, NULL, &error); + avahi_server_config_free(&config); - glib_poll = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT); - - avahi = avahi_server_new(avahi_glib_poll_get(glib_poll), NULL, server_callback, NULL, &error); - - loop = g_main_loop_new(NULL, 0); - g_timeout_add(1000*5, dump_timeout, avahi); - g_timeout_add(1000*5, rename_timeout, avahi); - g_main_loop_run(loop); - g_main_loop_unref(loop); + avahi_elapse_time(&tv, 5000, 0); + poll_api->timeout_new(poll_api, &tv, dump_timeout_callback, avahi); + + avahi_elapse_time(&tv, 5000, 0); + poll_api->timeout_new(poll_api, &tv, rename_timeout_callback, avahi); + + /* Evil, but the conformace test requires that*/ + create_service("gurke"); + + + avahi_simple_poll_loop(simple_poll); if (group) - avahi_s_entry_group_free(group); + avahi_s_entry_group_free(group); avahi_server_free(avahi); - avahi_glib_poll_free(glib_poll); - + avahi_simple_poll_free(simple_poll); + return 0; }