X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fannounce.c;h=6f94a74bab6bb1a1a751290b59e53c6bb319bb85;hb=fd84f9ae1c1ccaf7090e0b4f8876948bea040117;hp=8149b387a3464356a0e50cc32394df831bb4fe7c;hpb=f5a4db2039532ef93fbb3d98fa048be9d74a83fe;p=catta

diff --git a/avahi-core/announce.c b/avahi-core/announce.c
index 8149b38..6f94a74 100644
--- a/avahi-core/announce.c
+++ b/avahi-core/announce.c
@@ -120,10 +120,10 @@ static void next_state(AvahiAnnouncement *a) {
         if (a->n_iteration >= 4) {
             /* Probing done */
             
-            gchar *t;
+/*             gchar *t; */
 
-            g_message("Enough probes for record [%s]", t = avahi_record_to_string(a->entry->record));
-            g_free(t);
+/*             g_message("Enough probes for record [%s]", t = avahi_record_to_string(a->entry->record)); */
+/*             g_free(t); */
 
             if (a->entry->group) {
                 g_assert(a->entry->group->n_probing);
@@ -156,16 +156,16 @@ static void next_state(AvahiAnnouncement *a) {
             /* Send the whole rrset at once */
             avahi_server_prepare_matching_responses(a->server, a->interface, a->entry->record->key, FALSE);
         else
-            avahi_server_prepare_response(a->server, a->interface, a->entry, FALSE);
+            avahi_server_prepare_response(a->server, a->interface, a->entry, FALSE, FALSE);
 
         avahi_server_generate_response(a->server, a->interface, NULL, NULL, 0, FALSE);
 
         if (++a->n_iteration >= 4) {
-            gchar *t;
+/*             gchar *t; */
             /* Announcing done */
 
-            g_message("Enough announcements for record [%s]", t = avahi_record_to_string(a->entry->record));
-            g_free(t);
+/*             g_message("Enough announcements for record [%s]", t = avahi_record_to_string(a->entry->record)); */
+/*             g_free(t); */
 
             a->state = AVAHI_ESTABLISHED;
 
@@ -239,7 +239,7 @@ static void go_to_initial_state(AvahiAnnouncement *a, gboolean immediately) {
 
 static void new_announcement(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
     AvahiAnnouncement *a;
-    gchar *t; 
+/*     gchar *t;  */
 
     g_assert(s);
     g_assert(i);
@@ -254,7 +254,7 @@ static void new_announcement(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
 
     /* We don't want duplicate announcements */
     if (avahi_get_announcement(s, e, i))
-        return;
+        return;    
 
     a = g_new(AvahiAnnouncement, 1);
     a->server = s;
@@ -267,8 +267,8 @@ static void new_announcement(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
 
     go_to_initial_state(a, FALSE);
     
-    g_message("New announcement on interface %s.%i for entry [%s] state=%i", i->hardware->name, i->protocol, t = avahi_record_to_string(e->record), a->state);
-    g_free(t);
+/*     g_message("New announcement on interface %s.%i for entry [%s] state=%i", i->hardware->name, i->protocol, t = avahi_record_to_string(e->record), a->state); */
+/*     g_free(t); */
 }
 
 void avahi_announce_interface(AvahiServer *s, AvahiInterface *i) {
@@ -399,7 +399,7 @@ static void send_goodbye_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, g
         return;
     
     g = make_goodbye_record(e->record);
-    avahi_interface_post_response(i, g, e->flags & AVAHI_ENTRY_UNIQUE, TRUE, NULL);
+    avahi_interface_post_response(i, g, e->flags & AVAHI_ENTRY_UNIQUE, NULL, TRUE);
     avahi_record_unref(g);
 }