* add announcing/goodbye

[catta] / server.h

diff --git a/server.h b/server.h
index 7c96e780152c07005b1784d704fe1d37b4ac93ea..b7addf641b313cac15e0607696e20477453530ba 100644 (file)
--- a/server.h
+++ b/server.h
@@ -1,23 +1,30 @@
 #ifndef fooflxserverhfoo
 #define fooflxserverhfoo
 
+typedef struct _flxServerEntry flxServerEntry;
+
 #include "flx.h"
 #include "iface.h"
+#include "prioq.h"
+#include "llist.h"
+#include "timeeventq.h"
+#include "announce.h"
 
-struct _flxEntry {
-    flxRecord rr;
+struct _flxServerEntry {
+    flxRecord *record;
     gint id;
     gint interface;
+    guchar protocol;
 
-    int unique;
+    gboolean unique;
 
-    struct _flxEntry *next, *prev;
-    struct _flxEntry *next_by_name, *prev_by_name;
-    struct _flxEntry *next_by_id, *prev_by_id;
+    FLX_LLIST_FIELDS(flxServerEntry, entry);
+    FLX_LLIST_FIELDS(flxServerEntry, by_key);
+    FLX_LLIST_FIELDS(flxServerEntry, by_id);
+    
+    FLX_LLIST_HEAD(flxAnnouncement, announcements);
 };
 
-typedef struct _flxEntry flxEntry;
-
 struct _flxServer {
     GMainContext *context;
     flxInterfaceMonitor *monitor;
@@ -25,9 +32,21 @@ struct _flxServer {
     gint current_id;
     
     GHashTable *rrset_by_id;
-    GHashTable *rrset_by_name;
+    GHashTable *rrset_by_key;
 
-    flxEntry *entries;
+    FLX_LLIST_HEAD(flxServerEntry, entries);
+
+    flxTimeEventQueue *time_event_queue;
+    
+    gchar *hostname;
+
+    gint fd_ipv4, fd_ipv6;
+
+    GPollFD pollfd_ipv4, pollfd_ipv6;
+    GSource *source;
+    
 };
 
+gboolean flx_server_entry_match_interface(flxServerEntry *e, flxInterface *i);
+
 #endif