X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-client%2Fclient-test.c;h=ac5546d91897d12b14a994a450c87051d2621e83;hb=a534996c7f304b219c3c3c41d97f6c20051871f2;hp=775eb5d24adb18b6a056dd839d49fcdc472ebe56;hpb=854f901f491ccda79aee11edc3d59109cb229d28;p=catta diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c index 775eb5d..ac5546d 100644 --- a/avahi-client/client-test.c +++ b/avahi-client/client-test.c @@ -50,7 +50,6 @@ 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, @@ -224,11 +223,12 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED 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 (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED 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 (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { else printf ("Successfully created hostname resolver object\n"); - aar = avahi_address_parse ("224.0.0.251", AVAHI_PROTO_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 { @@ -313,9 +314,7 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED 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");