* case insensitive name comparisons

* corectly handle RRsets
* make addresses unique
* return to probe state on conflict
* a bunch of fixes detected while testing against the Apple Bonjour Conformance Test
* a fix in avahi_record_lexicographical_cmp() regarding TXT records
* API for choosing alternative host and service names
* remove a bunch of unused crap from cache.c and server.c
* flush cache when an interface becomes unavailable


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

1 files changed, 11 insertions, 13 deletions

diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 553a021..e275649 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -50,7 +50,7 @@ static void subscription(AvahiSubscription *s, AvahiRecord *r, gint interface, g
     g_assert(protocol != AF_UNSPEC);
 
     g_message("SUBSCRIPTION: record [%s] on %i.%i is %s", t = avahi_record_to_string(r), interface, protocol,
-              event == AVAHI_SUBSCRIPTION_NEW ? "new" : (event == AVAHI_SUBSCRIPTION_CHANGE ? "changed" : "removed"));
+              event == AVAHI_SUBSCRIPTION_NEW ? "new" : "removed");
 
     g_free(t);
 }
@@ -61,7 +61,6 @@ static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryG
 
 int main(int argc, char *argv[]) {
     AvahiServer *avahi;
-    gchar *r;
     GMainLoop *loop = NULL;
     AvahiSubscription *s;
     AvahiKey *k;
@@ -69,32 +68,31 @@ int main(int argc, char *argv[]) {
 
     avahi = avahi_server_new(NULL);
 
-     g = avahi_entry_group_new(avahi, entry_group_callback, NULL);  
+    g = avahi_entry_group_new(avahi, entry_group_callback, NULL);   
     
-    avahi_server_add_text(avahi, g, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE, "HALLO", "hallo", NULL); 
-    avahi_server_add_text(avahi, g, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE, "hallo", "waldo", NULL);
+/*     avahi_server_add_text(avahi, g, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE, "HALLO", avahi_server_get_hostname(avahi), NULL);  */
+/*     avahi_server_add_text(avahi, g, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE, "hallo", "waldo", NULL); */
     
-    avahi_server_add_service(avahi, g, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);  
+    avahi_server_add_service(avahi, g, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);   
     
-    avahi_entry_group_commit(g);  
+    avahi_entry_group_commit(g);   
 
     avahi_server_dump(avahi, stdout);
     
-    
-/*     k = avahi_key_new("ecstasy.local.", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_ANY); */
+/*     k = avahi_key_new("HALLO", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT); */
 /*     s = avahi_subscription_new(avahi, k, 0, AF_UNSPEC, subscription, NULL); */
 /*     avahi_key_unref(k); */
 
     loop = g_main_loop_new(NULL, FALSE);
     
-  /*   g_timeout_add(1000*20, dump_timeout, Avahi); */
-/*     g_timeout_add(1000*30, quit_timeout, loop);  */
+    g_timeout_add(1000*5, dump_timeout, avahi); 
+/*     g_timeout_add(1000*30, quit_timeout, loop);    */
     
     g_main_loop_run(loop);
     g_main_loop_unref(loop);
 
-/*     avahi_subscription_free(s); */
-    avahi_entry_group_free(g);  
+/*     avahi_subscription_free(s);  */
+    avahi_entry_group_free(g);   
     avahi_server_free(avahi);
     
     return 0;