X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fclient-test.c;h=67b977aa80b6c087ea94333a2a5214d43ea99fa2;hb=5dcaa3101f1088bb33d770a43191f3f0e3397896;hp=29dd62ab49110724a62e21738d10bcb5d994c0d5;hpb=dad41109f1726a876dd918290187d0a5296b267d;p=catta

diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c
index 29dd62a..67b977a 100644
--- a/avahi-client/client-test.c
+++ b/avahi-client/client-test.c
@@ -31,59 +31,136 @@
 #include <assert.h>
 
 static const AvahiPoll *poll_api = NULL;
+static AvahiSimplePoll *simple_poll = NULL;
 
 
 static void
 avahi_client_callback (AvahiClient *c, AvahiClientState state, void *user_data)
 {
-    printf ("XXX: Callback on client, state -> %d, data -> %s\n", state, (char*)user_data);
+    printf ("Callback on client, state -> %d, data -> %s\n", state, (char*)user_data);
 }
 
 static void
 avahi_entry_group_callback (AvahiEntryGroup *g, AvahiEntryGroupState state, void *user_data)
 {
-    printf ("XXX: Callback on %s, state -> %d, data -> %s\n", avahi_entry_group_get_dbus_path(g), state, (char*)user_data);
+    printf ("Callback on %s, state -> %d, data -> %s\n", avahi_entry_group_get_dbus_path(g), state, (char*)user_data);
 }
 
 static void
 avahi_domain_browser_callback (AvahiDomainBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *domain, void *user_data)
 {
-    printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", avahi_domain_browser_path (b), interface, protocol, event, domain, (char*)user_data);
+    printf ("Callback on %s, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", avahi_domain_browser_get_dbus_path (b), interface, protocol, event, domain, (char*)user_data);
+}
+
+static void
+avahi_service_resolver_callback (AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt, void *user_data)
+{
+    char addr[64];
+    char *txtr;
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+    {
+        printf ("ServiceResolver timed out\n");
+        avahi_service_resolver_free (r);
+        return;
+    }
+    avahi_address_snprint (addr, sizeof (addr), a);
+    txtr = avahi_string_list_to_string (txt);
+    printf ("Callback on ServiceResolver, interface (%d), protocol (%d), event (%d), name (%s), type (%s), domain (%s), host_name (%s), address (%s), port (%d), txtdata (%s), data(%s)\n", interface, protocol, event, name, type, domain, host_name, addr, port, txtr, (char*)user_data);
 }
 
 static void
 avahi_service_browser_callback (AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, void *user_data)
 {
-    printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), name (%s), type (%s), domain (%s), data (%s)\n", avahi_service_browser_path (b), interface, protocol, event, name, type, domain, (char*)user_data);
+    AvahiServiceResolver *sr;
+    if (b && name)
+    {
+        sr = avahi_service_resolver_new (avahi_service_browser_get_client (b), interface, protocol, name, type, domain, AF_UNSPEC, avahi_service_resolver_callback, "xxXXxx");
+    }
+    printf ("Callback on %s, interface (%d), protocol (%d), event (%d), name (%s), type (%s), domain (%s), data (%s)\n", avahi_service_browser_get_dbus_path (b), interface, protocol, event, name, type, domain, (char*)user_data);
 }
 
 static void
 avahi_service_type_browser_callback (AvahiServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *type, const char *domain, void *user_data)
 {
-    printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", avahi_service_type_browser_path (b), interface, protocol, event, type, domain, (char*)user_data);
+    printf ("Callback on %s, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", avahi_service_type_browser_get_dbus_path (b), interface, protocol, event, type, domain, (char*)user_data);
+}
+
+static void
+avahi_address_resolver_callback (AvahiAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, AvahiProtocol aprotocol, const AvahiAddress *address, const char *name, void *userdata)
+{
+    char addr[64];
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+    {
+        printf ("Callback on AddressResolver, timed out.\n");
+        avahi_address_resolver_free (r);
+        return;
+    }
+    avahi_address_snprint (addr, sizeof (addr), address);
+    printf ("Callback on AddressResolver, interface (%d), protocol (%d), even (%d), aprotocol (%d), address (%s), name (%s), data(%s)\n", interface, protocol, event, aprotocol, addr, name);
 }
 
+static void
+avahi_host_name_resolver_callback (AvahiHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const AvahiAddress *a, void *user_data)
+{
+    AvahiClient *client;
+    AvahiAddressResolver *ar;
+    char addr[64];
+    
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+    {
+        printf ("Callback on HostNameResolver, timed out.\n");
+        avahi_host_name_resolver_free (r);
+        return;
+    }
+    client = avahi_host_name_resolver_get_client (r);
+    ar = avahi_address_resolver_new_a (client, interface, protocol, a, avahi_address_resolver_callback, "omghai6u");
+    if (ar)
+    {
+        printf ("Succesfully created address resolver object\n");
+    } else {
+        printf ("Failed to create AddressResolver\n");
+    }
+    avahi_address_snprint (addr, sizeof (addr), a);
+    printf ("Callback on HostNameResolver, interface (%d), protocol (%d), event (%d), name (%s), address (%s), data (%s)\n", interface, protocol, event, name, addr, (char*)user_data);
+}
 static void test_free_domain_browser(AvahiTimeout *timeout, void* userdata)
 {
     AvahiServiceBrowser *b = userdata;
-    printf ("XXX: freeing domain browser\n");
+    printf ("Freeing domain browser\n");
     avahi_service_browser_free (b);
 }
 
 static void test_free_entry_group (AvahiTimeout *timeout, void* userdata)
 {
     AvahiEntryGroup *g = userdata;
-    printf ("XXX: freeing entry group\n");
+    printf ("Freeing entry group\n");
     avahi_entry_group_free (g);
 }
 
+static void test_entry_group_reset (AvahiTimeout *timeout, void* userdata)
+{
+    AvahiEntryGroup *g = userdata;
+
+    printf ("Resetting entry group\n");
+    avahi_entry_group_reset (g);
+
+    avahi_entry_group_add_service (g, AVAHI_IF_UNSPEC, AF_UNSPEC, "Lathiat's Site", "_http._tcp", "", "", 80, "foo=bar2", NULL);
+
+    avahi_entry_group_commit (g);
+}
+
+static void terminate(AvahiTimeout *timeout, void *userdata) {
+
+    avahi_simple_poll_quit(simple_poll);
+}
+
 int main (int argc, char *argv[]) {
     AvahiClient *avahi;
     AvahiEntryGroup *group;
     AvahiDomainBrowser *domain;
     AvahiServiceBrowser *sb;
     AvahiServiceTypeBrowser *st;
-    AvahiSimplePoll *simple_poll;
+    AvahiHostNameResolver *hnr;
     const char *ret;
     int error;
     struct timeval tv;
@@ -121,41 +198,53 @@ int main (int argc, char *argv[]) {
 
     avahi_entry_group_commit (group);
 
-    domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "", AVAHI_DOMAIN_BROWSER_BROWSE, avahi_domain_browser_callback, "omghai3u");
+    domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, avahi_domain_browser_callback, "omghai3u");
+    
     if (domain == NULL)
         printf ("Failed to create domain browser object\n");
     else
-        printf ("Sucessfully created domain browser, path %s\n", avahi_domain_browser_path (domain));
+        printf ("Sucessfully created domain browser, path %s\n", avahi_domain_browser_get_dbus_path (domain));
 
     st = avahi_service_type_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "", avahi_service_type_browser_callback, "omghai3u");
     if (st == NULL)
         printf ("Failed to create service type browser object\n");
     else
-        printf ("Sucessfully created service type browser, path %s\n", avahi_service_type_browser_path (st));
+        printf ("Sucessfully created service type browser, path %s\n", avahi_service_type_browser_get_dbus_path (st));
 
     sb = avahi_service_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "_http._tcp", "", avahi_service_browser_callback, "omghai3u");
     if (sb == NULL)
         printf ("Failed to create service browser object\n");
     else
-        printf ("Sucessfully created service browser, path %s\n", avahi_service_browser_path (sb));
+        printf ("Sucessfully created service browser, path %s\n", avahi_service_browser_get_dbus_path (sb));
+
+    hnr = avahi_host_name_resolver_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "hotbox.local", AF_UNSPEC, avahi_host_name_resolver_callback, "omghai4u");
+    if (hnr == NULL)
+        printf ("Failed to create hostname resolver object\n");
+    else
+        printf ("Successfully created hostname resolver object\n");
 
 
-    avahi_elapse_time(&tv, 5000, 0);
-    poll_api->timeout_new(poll_api, &tv, test_free_entry_group, group);
     avahi_elapse_time(&tv, 8000, 0);
+    poll_api->timeout_new(poll_api, &tv, test_entry_group_reset, 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);
     poll_api->timeout_new(poll_api, &tv, test_free_domain_browser, sb);
 
+    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;
 
 fail:
 
-    if (simple_poll)
-        avahi_simple_poll_free(simple_poll);
-
     if (avahi)
         avahi_client_free (avahi);
 
+    if (simple_poll)
+        avahi_simple_poll_free(simple_poll);
+
     return 0;
 }