moving upstream struct to header file.

git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1681 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

2 files changed, 61 insertions, 61 deletions

diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index 4bfa3f7..436c537 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -49,67 +49,6 @@
 
 #define CACHE_ENTRIES_MAX 500
 
-typedef struct AvahiWideAreaCacheEntry AvahiWideAreaCacheEntry;
-
-struct AvahiWideAreaCacheEntry {
-    AvahiWideAreaLookupEngine *engine;
-
-    AvahiRecord *record;
-    struct timeval timestamp;
-    struct timeval expiry;
-
-    AvahiTimeEvent *time_event;
-
-    AVAHI_LLIST_FIELDS(AvahiWideAreaCacheEntry, by_key);
-    AVAHI_LLIST_FIELDS(AvahiWideAreaCacheEntry, cache);
-};
-
-struct AvahiWideAreaLookup {
-    AvahiWideAreaLookupEngine *engine;
-    int dead;
-
-    uint32_t id;  /* effectively just an uint16_t, but we need it as an index for a hash table */
-    AvahiTimeEvent *time_event;
-
-    AvahiKey *key, *cname_key;
-
-    int n_send;
-    AvahiDnsPacket *packet;
-
-    AvahiWideAreaLookupCallback callback;
-    void *userdata;
-
-    AvahiAddress dns_server_used;
-
-    AVAHI_LLIST_FIELDS(AvahiWideAreaLookup, lookups);
-    AVAHI_LLIST_FIELDS(AvahiWideAreaLookup, by_key);
-};
-
-struct AvahiWideAreaLookupEngine {
-    AvahiServer *server;
-
-    int fd_ipv4, fd_ipv6;
-    AvahiWatch *watch_ipv4, *watch_ipv6;
-
-    uint16_t next_id;
-
-    /* Cache */
-    AVAHI_LLIST_HEAD(AvahiWideAreaCacheEntry, cache);
-    AvahiHashmap *cache_by_key;
-    unsigned cache_n_entries;
-
-    /* Lookups */
-    AVAHI_LLIST_HEAD(AvahiWideAreaLookup, lookups);
-    AvahiHashmap *lookups_by_id;
-    AvahiHashmap *lookups_by_key;
-
-    int cleanup_dead;
-
-    AvahiAddress dns_servers[AVAHI_WIDE_AREA_SERVERS_MAX];
-    unsigned n_dns_servers;
-    unsigned current_dns_server;
-};
-
 static AvahiWideAreaLookup* find_lookup(AvahiWideAreaLookupEngine *e, uint16_t id) {
     AvahiWideAreaLookup *l;
     int i = (int) id;
diff --git a/avahi-core/wide-area.h b/avahi-core/wide-area.h
index b41d6b7..3702277 100644
--- a/avahi-core/wide-area.h
+++ b/avahi-core/wide-area.h
@@ -35,6 +35,67 @@ typedef void (*AvahiWideAreaLookupCallback)(
     AvahiRecord *r,
     void *userdata);
 
+typedef struct AvahiWideAreaCacheEntry AvahiWideAreaCacheEntry;
+
+struct AvahiWideAreaCacheEntry {
+    AvahiWideAreaLookupEngine *engine;
+
+    AvahiRecord *record;
+    struct timeval timestamp;
+    struct timeval expiry;
+
+    AvahiTimeEvent *time_event;
+
+    AVAHI_LLIST_FIELDS(AvahiWideAreaCacheEntry, by_key);
+    AVAHI_LLIST_FIELDS(AvahiWideAreaCacheEntry, cache);
+};
+
+struct AvahiWideAreaLookup {
+    AvahiWideAreaLookupEngine *engine;
+    int dead;
+
+    uint32_t id;  /* effectively just an uint16_t, but we need it as an index for a hash table */
+    AvahiTimeEvent *time_event;
+
+    AvahiKey *key, *cname_key;
+
+    int n_send;
+    AvahiDnsPacket *packet;
+
+    AvahiWideAreaLookupCallback callback;
+    void *userdata;
+
+    AvahiAddress dns_server_used;
+
+    AVAHI_LLIST_FIELDS(AvahiWideAreaLookup, lookups);
+    AVAHI_LLIST_FIELDS(AvahiWideAreaLookup, by_key);
+};
+
+struct AvahiWideAreaLookupEngine {
+    AvahiServer *server;
+
+    int fd_ipv4, fd_ipv6;
+    AvahiWatch *watch_ipv4, *watch_ipv6;
+
+    uint16_t next_id;
+
+    /* Cache */
+    AVAHI_LLIST_HEAD(AvahiWideAreaCacheEntry, cache);
+    AvahiHashmap *cache_by_key;
+    unsigned cache_n_entries;
+
+    /* Lookups */
+    AVAHI_LLIST_HEAD(AvahiWideAreaLookup, lookups);
+    AvahiHashmap *lookups_by_id;
+    AvahiHashmap *lookups_by_key;
+
+    int cleanup_dead;
+
+    AvahiAddress dns_servers[AVAHI_WIDE_AREA_SERVERS_MAX];
+    unsigned n_dns_servers;
+    unsigned current_dns_server;
+};
+
 AvahiWideAreaLookupEngine *avahi_wide_area_engine_new(AvahiServer *s);
 void avahi_wide_area_engine_free(AvahiWideAreaLookupEngine *e);