X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Favahi-test.c;h=805453a987cab36b6bda2f9aa087d95b66d843a4;hb=da69334ace7a4620e67fbf0a3eed61835d272ae3;hp=45a37f2840fd3a6a617e3ebeb519bb3b78eb091f;hpb=22a61b042376903deada022e7585e0585aaa7d43;p=catta

diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 45a37f2..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,12 +136,37 @@ 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) {
 
-    g_message("DB: (%i.%i) %s [%s]", iface, protocol, domain, event == AVAHI_BROWSER_NEW ? "new" : "remove");
+    g_message("DB: (%i.%i) <%s> [%s]", iface, protocol, domain, event == AVAHI_BROWSER_NEW ? "new" : "remove");
+}
+
+static void stb_callback(AvahiServiceTypeBrowser *b, gint iface, guchar protocol, AvahiBrowserEvent event, const gchar *service_type, const gchar *domain, gpointer userdata) {
+
+    g_message("STB: (%i.%i) %s in <%s> [%s]", iface, protocol, service_type, domain, event == AVAHI_BROWSER_NEW ? "new" : "remove");
+}
+
+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[]) {
@@ -153,6 +178,9 @@ int main(int argc, char *argv[]) {
     AvahiServerConfig config;
     AvahiAddress a;
     AvahiDomainBrowser *db;
+    AvahiServiceTypeBrowser *stb;
+    AvahiServiceBrowser *sb;
+    AvahiServiceResolver *sr;
 
     avahi_server_config_init(&config);
 /*     config.host_name = g_strdup("test"); */
@@ -160,14 +188,20 @@ int main(int argc, char *argv[]) {
     avahi_server_config_free(&config);
 
     k = avahi_key_new("_http._tcp.local", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
-    r = avahi_record_browser_new(server, 0, AF_UNSPEC, k, record_browser_callback, NULL);
+    r = avahi_record_browser_new(server, -1, AF_UNSPEC, k, record_browser_callback, NULL);
     avahi_key_unref(k);
 
-    hnr = avahi_host_name_resolver_new(server, 0, AF_UNSPEC, "codes-CompUTER.local", AF_UNSPEC, hnr_callback, NULL);
+    hnr = avahi_host_name_resolver_new(server, -1, AF_UNSPEC, "codes-CompUTER.local", AF_UNSPEC, hnr_callback, NULL);
+
+    ar = avahi_address_resolver_new(server, -1, AF_UNSPEC, avahi_address_parse("192.168.50.15", AF_INET, &a), ar_callback, NULL);
+
+    db = avahi_domain_browser_new(server, -1, AF_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, db_callback, NULL);
+
+    stb = avahi_service_type_browser_new(server, -1, AF_UNSPEC, NULL, stb_callback, NULL);
 
-    ar = avahi_address_resolver_new(server, 0, AF_UNSPEC, avahi_address_parse("192.168.50.15", AF_INET, &a), ar_callback, NULL);
+    sb = avahi_service_browser_new(server, -1, AF_UNSPEC, "_http._tcp", NULL, sb_callback, NULL);
 
-    db = avahi_domain_browser_new(server, 0, AF_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, db_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);
     
@@ -180,6 +214,9 @@ int main(int argc, char *argv[]) {
     avahi_record_browser_free(r);
     avahi_host_name_resolver_free(hnr);
     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);