X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fclient-test.c;h=6ca99d68e6da2c84b4e99a657a9bd23975b49afd;hb=6ecd227ceadc32ed229246aa61df6361c7b58a95;hp=c7789baedc68e5b13f73dd1eecb008c9b85e7c81;hpb=bb14e0a8aa3173c8a6d80b1a9c8b300a452ee9f1;p=catta diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c index c7789ba..6ca99d6 100644 --- a/avahi-client/client-test.c +++ b/avahi-client/client-test.c @@ -27,9 +27,13 @@ #include #include +#include +#include + #include #include #include +#include static const AvahiPoll *poll_api = NULL; static AvahiSimplePoll *simple_poll = NULL; @@ -42,13 +46,18 @@ static void avahi_entry_group_callback (AvahiEntryGroup *g, AvahiEntryGroupState printf ("ENTRY-GROUP: Callback on %p, state -> %d, data -> %s\n", (void*) g, state, (char*)userdata); } +static void avahi_entry_group2_callback (AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) { + 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); @@ -66,7 +75,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]; @@ -89,7 +98,7 @@ 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; @@ -110,21 +119,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); } static void avahi_address_resolver_callback ( - AvahiAddressResolver *r, + AVAHI_GCC_UNUSED AvahiAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, - AvahiProtocol aprotocol, const AvahiAddress *address, const char *name, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { char addr[64]; @@ -133,7 +141,7 @@ static void avahi_address_resolver_callback ( return; } avahi_address_snprint (addr, sizeof (addr), address); - printf ("ADDRESS-RESOLVER: Callback on AddressResolver, interface (%d), protocol (%d), even (%d), aprotocol (%d), address (%s), name (%s), data(%s)\n", interface, protocol, event, aprotocol, addr, name, (char*) userdata); + printf ("ADDRESS-RESOLVER: Callback on AddressResolver, interface (%d), protocol (%d), even (%d), address (%s), name (%s), data(%s)\n", interface, protocol, event, addr, name, (char*) userdata); } static void avahi_host_name_resolver_callback ( @@ -143,7 +151,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; @@ -155,7 +163,7 @@ static void avahi_host_name_resolver_callback ( return; } client = avahi_host_name_resolver_get_client (r); - ar = avahi_address_resolver_new_a (client, interface, protocol, a, 0, avahi_address_resolver_callback, "omghai6u"); + ar = avahi_address_resolver_new(client, interface, protocol, a, 0, avahi_address_resolver_callback, "omghai6u"); if (ar) { printf ("Succesfully created address resolver object\n"); @@ -165,21 +173,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; @@ -191,18 +199,27 @@ static void test_entry_group_reset (AvahiTimeout *timeout, void* userdata) avahi_entry_group_commit (g); } -static void terminate(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"); + + 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(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; + AvahiEntryGroup *group, *group2; AvahiDomainBrowser *domain; AvahiServiceBrowser *sb; AvahiServiceTypeBrowser *st; AvahiHostNameResolver *hnr; + AvahiAddress *aar; const char *ret; int error; uint32_t cookie; @@ -211,7 +228,7 @@ int main (int argc, char *argv[]) { 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; } @@ -233,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); @@ -269,9 +287,25 @@ int main (int argc, char *argv[]) { else printf ("Successfully created hostname resolver object\n"); + aar = avahi_address_parse ("224.0.0.251", AVAHI_PROTO_UNSPEC, aar); + if (aar == NULL) { + printf ("failed to create address object\n"); + } else { + group2 = avahi_entry_group_new (avahi, avahi_entry_group2_callback, "omghai222"); + if ((error = avahi_entry_group_add_address (group2, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "test-mdns.local.", aar)) < 0) + { + printf ("*** failed to add address to entry group: %s\n", avahi_strerror (error)); + avahi_entry_group_free (group2); + } else { + 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); + poll_api->timeout_new(poll_api, &tv, test_entry_group_update, group); avahi_elapse_time(&tv, 20000, 0); poll_api->timeout_new(poll_api, &tv, test_free_entry_group, group); avahi_elapse_time(&tv, 25000, 0); @@ -280,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");