Impelement AvahiServiceResolver

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@88 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 23 insertions, 3 deletions

diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index e4ed4ab..805453a 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -128,7 +128,7 @@ static void hnr_callback(AvahiHostNameResolver *r, gint iface, guchar protocol,
     if (a)
         avahi_address_snprint(t, sizeof(t), a);
 
-    g_message("HNR: (%i.%i) <%s> -> %s [%s]", iface, protocol, hostname, a ? t : "n/a", event == AVAHI_BROWSER_NEW ? "found" : "timeout");
+    g_message("HNR: (%i.%i) <%s> -> %s [%s]", iface, protocol, hostname, a ? t : "n/a", event == AVAHI_RESOLVER_FOUND ? "found" : "timeout");
 }
 
 static void ar_callback(AvahiAddressResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const AvahiAddress *a, const gchar *hostname, gpointer userdata) {
@@ -136,7 +136,7 @@ static void ar_callback(AvahiAddressResolver *r, gint iface, guchar protocol, Av
 
     avahi_address_snprint(t, sizeof(t), a);
 
-    g_message("AR: (%i.%i) %s -> <%s> [%s]", iface, protocol, t, hostname ? hostname : "n/a", event == AVAHI_BROWSER_NEW ? "found" : "timeout");
+    g_message("AR: (%i.%i) %s -> <%s> [%s]", iface, protocol, t, hostname ? hostname : "n/a", event == AVAHI_RESOLVER_FOUND ? "found" : "timeout");
 }
 
 static void db_callback(AvahiDomainBrowser *b, gint iface, guchar protocol, AvahiBrowserEvent event, const gchar *domain, gpointer userdata) {
@@ -152,7 +152,23 @@ static void stb_callback(AvahiServiceTypeBrowser *b, gint iface, guchar protocol
 static void sb_callback(AvahiServiceBrowser *b, gint iface, guchar protocol, AvahiBrowserEvent event, const gchar *name, const gchar *service_type, const gchar *domain, gpointer userdata) {
    g_message("SB: (%i.%i) <%s> as %s in <%s> [%s]", iface, protocol, name, service_type, domain, event == AVAHI_BROWSER_NEW ? "new" : "remove");
 }
-    
+
+
+static void sr_callback(AvahiServiceResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const gchar *service_name, const gchar*service_type, const gchar*domain_name, const gchar*hostname, const AvahiAddress *a, guint16 port, AvahiStringList *txt, gpointer userdata) {
+
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+        g_message("SR: (%i.%i) <%s> as %s in <%s> [timeout]", iface, protocol, service_name, service_type, domain_name);
+    else {
+        gchar t[64], *s;
+        
+        avahi_address_snprint(t, sizeof(t), a);
+
+        s = avahi_string_list_to_string(txt);
+        g_message("SR: (%i.%i) <%s> as %s in <%s>: %s/%s:%i (%s) [found]", iface, protocol, service_name, service_type, domain_name, hostname, t, port, s);
+        g_free(s);
+    }
+}
+
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
     AvahiRecordBrowser *r;
@@ -164,6 +180,7 @@ int main(int argc, char *argv[]) {
     AvahiDomainBrowser *db;
     AvahiServiceTypeBrowser *stb;
     AvahiServiceBrowser *sb;
+    AvahiServiceResolver *sr;
 
     avahi_server_config_init(&config);
 /*     config.host_name = g_strdup("test"); */
@@ -183,6 +200,8 @@ int main(int argc, char *argv[]) {
     stb = avahi_service_type_browser_new(server, -1, AF_UNSPEC, NULL, stb_callback, NULL);
 
     sb = avahi_service_browser_new(server, -1, AF_UNSPEC, "_http._tcp", NULL, sb_callback, NULL);
+
+    sr = avahi_service_resolver_new(server, -1, AF_UNSPEC, "Ecstasy HTTP", "_http._tcp", "local", AF_UNSPEC, sr_callback, NULL);
     
     loop = g_main_loop_new(NULL, FALSE);
     
@@ -197,6 +216,7 @@ int main(int argc, char *argv[]) {
     avahi_address_resolver_free(ar);
     avahi_service_type_browser_free(stb);
     avahi_service_browser_free(sb);
+    avahi_service_resolver_free(sr);
 
     if (group)
         avahi_entry_group_free(group);