X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fannounce.c;h=b66dadadb70cf831c017a29c1f00f4ec5dbb371d;hb=5e6703337b90bccb1713ef9cb1aa5f029d75698f;hp=d1e5995bc1fcb1fb65b86315ff6640fdcac8e199;hpb=41f2725b37437a585ce285051bdae06f4919dc3b;p=catta

diff --git a/avahi-core/announce.c b/avahi-core/announce.c
index d1e5995..b66dada 100644
--- a/avahi-core/announce.c
+++ b/avahi-core/announce.c
@@ -28,27 +28,28 @@
 
 #include "announce.h"
 #include "log.h"
+#include "rr-util.h"
 
 #define AVAHI_ANNOUNCEMENT_JITTER_MSEC 250
 #define AVAHI_PROBE_JITTER_MSEC 250
 #define AVAHI_PROBE_INTERVAL_MSEC 250
 
-static void remove_announcement(AvahiServer *s, AvahiAnnouncement *a) {
+static void remove_announcer(AvahiServer *s, AvahiAnnouncer *a) {
     assert(s);
     assert(a);
 
     if (a->time_event)
         avahi_time_event_free(a->time_event);
 
-    AVAHI_LLIST_REMOVE(AvahiAnnouncement, by_interface, a->interface->announcements, a);
-    AVAHI_LLIST_REMOVE(AvahiAnnouncement, by_entry, a->entry->announcements, a);
+    AVAHI_LLIST_REMOVE(AvahiAnnouncer, by_interface, a->interface->announcers, a);
+    AVAHI_LLIST_REMOVE(AvahiAnnouncer, by_entry, a->entry->announcers, a);
     
     avahi_free(a);
 }
 
 static void elapse_announce(AvahiTimeEvent *e, void *userdata);
 
-static void set_timeout(AvahiAnnouncement *a, const struct timeval *tv) {
+static void set_timeout(AvahiAnnouncer *a, const struct timeval *tv) {
     assert(a);
 
     if (!tv) {
@@ -65,7 +66,7 @@ static void set_timeout(AvahiAnnouncement *a, const struct timeval *tv) {
     }
 }
 
-static void next_state(AvahiAnnouncement *a);
+static void next_state(AvahiAnnouncer *a);
 
 void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately) {
     AvahiEntry *e;
@@ -82,11 +83,11 @@ void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately) {
     if (g->dead)
         return;
     
-    for (e = g->entries; e; e = e->entries_next) {
-        AvahiAnnouncement *a;
+    for (e = g->entries; e; e = e->by_group_next) {
+        AvahiAnnouncer *a;
         
-        for (a = e->announcements; a; a = a->by_entry_next) {
-
+        for (a = e->announcers; a; a = a->by_entry_next) {
+            
             if (a->state != AVAHI_WAITING)
                 continue;
             
@@ -107,11 +108,9 @@ void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately) {
     }
 }
 
-static void next_state(AvahiAnnouncement *a) {
+static void next_state(AvahiAnnouncer *a) {
     assert(a);
 
-/*     avahi_log_debug("%i -- %u", a->state, a->n_iteration);   */
-    
     if (a->state == AVAHI_WAITING) {
 
         assert(a->entry->group);
@@ -123,11 +122,6 @@ static void next_state(AvahiAnnouncement *a) {
         if (a->n_iteration >= 4) {
             /* Probing done */
             
-/*             char *t; */
-
-/*             avahi_log_debug("Enough probes for record [%s]", t = avahi_record_to_string(a->entry->record)); */
-/*             avahi_free(t); */
-
             if (a->entry->group) {
                 assert(a->entry->group->n_probing);
                 a->entry->group->n_probing--;
@@ -164,12 +158,8 @@ static void next_state(AvahiAnnouncement *a) {
         avahi_server_generate_response(a->server, a->interface, NULL, NULL, 0, 0, 0);
 
         if (++a->n_iteration >= 4) {
-/*             char *t; */
             /* Announcing done */
 
-/*             avahi_log_debug("Enough announcements for record [%s]", t = avahi_record_to_string(a->entry->record)); */
-/*             avahi_free(t); */
-
             a->state = AVAHI_ESTABLISHED;
 
             set_timeout(a, NULL);
@@ -191,21 +181,21 @@ static void elapse_announce(AvahiTimeEvent *e, void *userdata) {
     next_state(userdata);
 }
 
-AvahiAnnouncement *avahi_get_announcement(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
-    AvahiAnnouncement *a;
+static AvahiAnnouncer *get_announcer(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
+    AvahiAnnouncer *a;
     
     assert(s);
     assert(e);
     assert(i);
 
-    for (a = e->announcements; a; a = a->by_entry_next)
+    for (a = e->announcers; a; a = a->by_entry_next)
         if (a->interface == i)
             return a;
 
     return NULL;
 }
 
-static void go_to_initial_state(AvahiAnnouncement *a, int immediately) {
+static void go_to_initial_state(AvahiAnnouncer *a) {
     AvahiEntry *e;
     struct timeval tv;
         
@@ -238,26 +228,22 @@ static void go_to_initial_state(AvahiAnnouncement *a, int immediately) {
         set_timeout(a, NULL);
 }
 
-static void new_announcement(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
-    AvahiAnnouncement *a;
-/*     char *t;  */
+static void new_announcer(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
+    AvahiAnnouncer *a;
 
     assert(s);
     assert(i);
     assert(e);
     assert(!e->dead);
 
-/*     avahi_log_debug("NEW ANNOUNCEMENT: %s.%i [%s]", i->hardware->name, i->protocol, t = avahi_record_to_string(e->record)); */
-/*     avahi_free(t); */
-    
     if (!avahi_interface_match(i, e->interface, e->protocol) || !i->announcing || !avahi_entry_is_commited(e))
         return;
 
-    /* We don't want duplicate announcements */
-    if (avahi_get_announcement(s, e, i))
+    /* We don't want duplicate announcers */
+    if (get_announcer(s, e, i))
         return;    
 
-    if ((!(a = avahi_new(AvahiAnnouncement, 1)))) {
+    if ((!(a = avahi_new(AvahiAnnouncer, 1)))) {
         avahi_log_error(__FILE__": Out of memory.");
         return;
     }
@@ -267,13 +253,10 @@ static void new_announcement(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
     a->entry = e;
     a->time_event = NULL;
 
-    AVAHI_LLIST_PREPEND(AvahiAnnouncement, by_interface, i->announcements, a);
-    AVAHI_LLIST_PREPEND(AvahiAnnouncement, by_entry, e->announcements, a);
+    AVAHI_LLIST_PREPEND(AvahiAnnouncer, by_interface, i->announcers, a);
+    AVAHI_LLIST_PREPEND(AvahiAnnouncer, by_entry, e->announcers, a);
 
-    go_to_initial_state(a, 0);
-    
-/*     avahi_log_debug("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); */
-/*     avahi_free(t); */
+    go_to_initial_state(a);
 }
 
 void avahi_announce_interface(AvahiServer *s, AvahiInterface *i) {
@@ -287,7 +270,7 @@ void avahi_announce_interface(AvahiServer *s, AvahiInterface *i) {
 
     for (e = s->entries; e; e = e->entries_next)
         if (!e->dead)
-            new_announcement(s, i, e);
+            new_announcer(s, i, e);
 }
 
 static void announce_walk_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata) {
@@ -298,7 +281,7 @@ static void announce_walk_callback(AvahiInterfaceMonitor *m, AvahiInterface *i,
     assert(e);
     assert(!e->dead);
 
-    new_announcement(m->server, i, e);
+    new_announcer(m->server, i, e);
 }
 
 void avahi_announce_entry(AvahiServer *s, AvahiEntry *e) {
@@ -321,14 +304,14 @@ void avahi_announce_group(AvahiServer *s, AvahiSEntryGroup *g) {
 }
 
 int avahi_entry_is_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
-    AvahiAnnouncement *a;
+    AvahiAnnouncer *a;
 
     assert(s);
     assert(e);
     assert(i);
     assert(!e->dead);
 
-    if (!(a = avahi_get_announcement(s, e, i)))
+    if (!(a = get_announcer(s, e, i)))
         return 0;
     
     return
@@ -338,17 +321,15 @@ int avahi_entry_is_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i)
 }
 
 int avahi_entry_is_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
-    AvahiAnnouncement *a;
+    AvahiAnnouncer *a;
 
     assert(s);
     assert(e);
     assert(i);
     assert(!e->dead);
 
-    if (!(a = avahi_get_announcement(s, e, i)))
+    if (!(a = get_announcer(s, e, i)))
         return 0;
-
-/*     avahi_log_debug("state: %i", a->state); */
     
     return
         a->state == AVAHI_PROBING ||
@@ -356,30 +337,26 @@ int avahi_entry_is_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
 }
 
 void avahi_entry_return_to_initial_state(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
-    AvahiAnnouncement *a;
+    AvahiAnnouncer *a;
     
     assert(s);
     assert(e);
     assert(i);
 
-    if (!(a = avahi_get_announcement(s, e, i)))
+    if (!(a = get_announcer(s, e, i)))
         return;
 
     if (a->state == AVAHI_PROBING && a->entry->group)
         a->entry->group->n_probing--;
 
-    go_to_initial_state(a, 1);
+    go_to_initial_state(a);
 }
 
 static AvahiRecord *make_goodbye_record(AvahiRecord *r) {
-/*     char *t; */
     AvahiRecord *g;
     
     assert(r);
 
-/*     avahi_log_debug("Preparing goodbye for record [%s]", t = avahi_record_to_string(r)); */
-/*     avahi_free(t); */
-
     if (!(g = avahi_record_copy(r)))
         return NULL; /* OOM */
     
@@ -437,7 +414,7 @@ static void send_goodbye_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, v
     avahi_record_unref(g);
 }
 
-static void reannounce(AvahiAnnouncement *a) {
+static void reannounce(AvahiAnnouncer *a) {
     AvahiEntry *e;
     struct timeval tv;
         
@@ -465,7 +442,7 @@ static void reannounce(AvahiAnnouncement *a) {
 
     else if (e->flags & AVAHI_PUBLISH_NO_ANNOUNCE)
         
-        /* No announcement needed */
+        /* No announcer needed */
         a->state = AVAHI_ESTABLISHED;
 
     else {
@@ -492,14 +469,14 @@ static void reannounce(AvahiAnnouncement *a) {
 
 static void reannounce_walk_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata) {
     AvahiEntry *e = userdata;
-    AvahiAnnouncement *a;
+    AvahiAnnouncer *a;
     
     assert(m);
     assert(i);
     assert(e);
     assert(!e->dead);
 
-    if (!(a = avahi_get_announcement(m->server, e, i)))
+    if (!(a = get_announcer(m->server, e, i)))
         return;
 
     reannounce(a);
@@ -528,8 +505,8 @@ void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, int send_goodbye
         }
 
     if (remove)
-        while (i->announcements)
-            remove_announcement(s, i->announcements);
+        while (i->announcers)
+            remove_announcer(s, i->announcers);
 }
 
 void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, int send_goodbye, int remove) {
@@ -541,18 +518,7 @@ void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, int send_goodbye, int re
             avahi_interface_monitor_walk(s->monitor, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, send_goodbye_callback, e);
 
     if (remove)
-        while (e->announcements)
-            remove_announcement(s, e->announcements);
-}
-
-void avahi_goodbye_all(AvahiServer *s, int send_goodbye, int remove) {
-    AvahiEntry *e;
-    
-    assert(s);
-
-    for (e = s->entries; e; e = e->entries_next)
-        if (!e->dead)
-            avahi_goodbye_entry(s, e, send_goodbye, remove);
-
+        while (e->announcers)
+            remove_announcer(s, e->announcers);
 }