X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fclient-test.c;h=7d306515fb32deab5a1746783985bdc96999d556;hb=c878c09b354196a7814123016676bdaac7b9147a;hp=f9913e624f276a86d8d45085a6eccc5ed7f87ab0;hpb=6b391bb81f0dce0193a722254016b26c12a17643;p=catta diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c index f9913e6..7d30651 100644 --- a/avahi-client/client-test.c +++ b/avahi-client/client-test.c @@ -50,17 +50,16 @@ static void avahi_entry_group2_callback (AvahiEntryGroup *g, AvahiEntryGroupStat printf ("ENTRY-GROUP2: Callback on %p, state -> %d, data -> %s\n", (void*) g, state, (char*)userdata); } - static void avahi_domain_browser_callback( AvahiDomainBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *domain, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { - printf ("DOMAIN-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, domain, (char*)userdata); + printf ("DOMAIN-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, domain ? domain : "NULL", (char*)userdata); } static void avahi_service_resolver_callback( @@ -75,7 +74,7 @@ static void avahi_service_resolver_callback( const AvahiAddress *a, uint16_t port, AvahiStringList *txt, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { char addr[64]; @@ -98,12 +97,12 @@ static void avahi_service_browser_callback ( const char *name, const char *type, const char *domain, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { AvahiServiceResolver *sr; - printf ("SERVICE-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), name (%s), type (%s), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, name, type, domain, (char*)userdata); + printf ("SERVICE-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), name (%s), type (%s), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, name ? name : "NULL", type, domain ? domain : "NULL", (char*)userdata); if (b && name) { @@ -119,20 +118,20 @@ static void avahi_service_type_browser_callback ( AvahiBrowserEvent event, const char *type, const char *domain, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { - printf ("SERVICE-TYPE-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, type, domain, (char*)userdata); + printf ("SERVICE-TYPE-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, type ? type : "NULL", domain ? domain : "NULL", (char*)userdata); } static void avahi_address_resolver_callback ( - AvahiAddressResolver *r, + AVAHI_GCC_UNUSED AvahiAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const AvahiAddress *address, const char *name, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { char addr[64]; @@ -151,7 +150,7 @@ static void avahi_host_name_resolver_callback ( AvahiResolverEvent event, const char *name, const AvahiAddress *a, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { AvahiClient *client; @@ -173,21 +172,21 @@ static void avahi_host_name_resolver_callback ( avahi_address_snprint (addr, sizeof (addr), a); printf ("HOST-NAME-RESOLVER: Callback on HostNameResolver, interface (%d), protocol (%d), event (%d), name (%s), address (%s), data (%s)\n", interface, protocol, event, name, addr, (char*)userdata); } -static void test_free_domain_browser(AvahiTimeout *timeout, void* userdata) +static void test_free_domain_browser(AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiServiceBrowser *b = userdata; printf ("Freeing domain browser\n"); avahi_service_browser_free (b); } -static void test_free_entry_group (AvahiTimeout *timeout, void* userdata) +static void test_free_entry_group (AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiEntryGroup *g = userdata; printf ("Freeing entry group\n"); avahi_entry_group_free (g); } -static void test_entry_group_reset (AvahiTimeout *timeout, void* userdata) +static void test_entry_group_reset (AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiEntryGroup *g = userdata; @@ -199,7 +198,7 @@ static void test_entry_group_reset (AvahiTimeout *timeout, void* userdata) avahi_entry_group_commit (g); } -static void test_entry_group_update(AvahiTimeout *timeout, void* userdata) { +static void test_entry_group_update(AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiEntryGroup *g = userdata; printf ("Updating entry group\n"); @@ -207,12 +206,12 @@ static void test_entry_group_update(AvahiTimeout *timeout, void* userdata) { avahi_entry_group_update_service_txt(g, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, "foo=bar3", NULL); } -static void terminate(AvahiTimeout *timeout, void *userdata) { +static void terminate(AVAHI_GCC_UNUSED AvahiTimeout *timeout, AVAHI_GCC_UNUSED void *userdata) { avahi_simple_poll_quit(simple_poll); } -int main (int argc, char *argv[]) { +int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { AvahiClient *avahi; AvahiEntryGroup *group, *group2; AvahiDomainBrowser *domain; @@ -224,11 +223,12 @@ int main (int argc, char *argv[]) { int error; uint32_t cookie; struct timeval tv; + AvahiAddress a; simple_poll = avahi_simple_poll_new(); poll_api = avahi_simple_poll_get(simple_poll); - if (!(avahi = avahi_client_new(poll_api, avahi_client_callback, "omghai2u", &error))) { + if (!(avahi = avahi_client_new(poll_api, 0, avahi_client_callback, "omghai2u", &error))) { fprintf(stderr, "Client failed: %s\n", avahi_strerror(error)); goto fail; } @@ -250,14 +250,15 @@ int main (int argc, char *argv[]) { cookie = avahi_client_get_local_service_cookie(avahi); printf("Local service cookie: %u (Error Return: %s)\n", cookie, cookie != AVAHI_SERVICE_COOKIE_INVALID ? "OK" : avahi_strerror(avahi_client_errno(avahi))); - group = avahi_entry_group_new (avahi, avahi_entry_group_callback, "omghai"); + group = avahi_entry_group_new(avahi, avahi_entry_group_callback, "omghai"); printf("Creating entry group: %s\n", group ? "OK" : avahi_strerror(avahi_client_errno (avahi))); assert(group); printf("Sucessfully created entry group %p\n", (void*) group); - avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL); + printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); + printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); avahi_entry_group_commit (group); @@ -286,7 +287,7 @@ int main (int argc, char *argv[]) { else printf ("Successfully created hostname resolver object\n"); - aar = avahi_address_parse ("224.0.0.251", AF_UNSPEC, aar); + aar = avahi_address_parse ("224.0.0.251", AVAHI_PROTO_UNSPEC, &a); if (aar == NULL) { printf ("failed to create address object\n"); } else { @@ -299,10 +300,8 @@ int main (int argc, char *argv[]) { printf ("*** success, added address\n"); avahi_entry_group_commit (group2); } - } - avahi_elapse_time(&tv, 8000, 0); poll_api->timeout_new(poll_api, &tv, test_entry_group_reset, group); avahi_elapse_time(&tv, 15000, 0); @@ -315,9 +314,7 @@ int main (int argc, char *argv[]) { avahi_elapse_time(&tv, 30000, 0); poll_api->timeout_new(poll_api, &tv, terminate, NULL); - for (;;) - if (avahi_simple_poll_iterate(simple_poll, -1) != 0) - break; + avahi_simple_poll_loop(simple_poll); printf("terminating...\n");