* using AC_GNU_SOURCE instead of -D _GNU_SOURCE

[catta] / avahi-core / server.h

diff --git a/avahi-core/server.h b/avahi-core/server.h
index fb137b03770c6f50c4a3fbd6966daf7b6c1a7f5a..9a1fca3d04c220c4ece120d0c7409559f7bcb73d 100644 (file)
--- a/avahi-core/server.h
+++ b/avahi-core/server.h
@@ -32,6 +32,21 @@
 #include "dns.h"
 #include "rrlist.h"
 
+#define AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS 100
+
+typedef struct AvahiLegacyUnicastReflectSlot AvahiLegacyUnicastReflectSlot;
+
+struct AvahiLegacyUnicastReflectSlot {
+    AvahiServer *server;
+    
+    guint16 id, original_id;
+    AvahiAddress address;
+    guint16 port;
+    gint interface;
+    GTimeVal elapse_time;
+    AvahiTimeEvent *time_event;
+};
+
 struct AvahiEntry {
     AvahiServer *server;
     AvahiEntryGroup *group;
@@ -83,6 +98,7 @@ struct AvahiServer {
     AVAHI_LLIST_HEAD(AvahiServiceTypeBrowser, service_type_browsers);
     AVAHI_LLIST_HEAD(AvahiServiceBrowser, service_browsers);
     AVAHI_LLIST_HEAD(AvahiServiceResolver, service_resolvers);
+    AVAHI_LLIST_HEAD(AvahiDNSServerBrowser, dns_server_browsers);
 
     gboolean need_entry_cleanup, need_group_cleanup, need_browser_cleanup;
     
@@ -90,9 +106,11 @@ struct AvahiServer {
     
     gchar *host_name, *host_name_fqdn, *domain_name;
 
-    gint fd_ipv4, fd_ipv6;
+    gint fd_ipv4, fd_ipv6,
+        /* The following two sockets two are used for reflection only */
+        fd_legacy_unicast_ipv4, fd_legacy_unicast_ipv6;
 
-    GPollFD pollfd_ipv4, pollfd_ipv6;
+    GPollFD pollfd_ipv4, pollfd_ipv6, pollfd_legacy_unicast_ipv4, pollfd_legacy_unicast_ipv6;
     GSource *source;
 
     AvahiServerState state;
@@ -107,6 +125,10 @@ struct AvahiServer {
     
     /* Used for assembling responses */
     AvahiRecordList *record_list;
+
+    /* Used for reflection of legacy unicast packets */
+    AvahiLegacyUnicastReflectSlot **legacy_unicast_reflect_slots;
+    guint16 legacy_unicast_reflect_id;
 };
 
 gboolean avahi_server_entry_match_interface(AvahiEntry *e, AvahiInterface *i);
@@ -115,7 +137,7 @@ void avahi_server_post_query(AvahiServer *s, gint interface, guchar protocol, Av
 
 void avahi_server_prepare_response(AvahiServer *s, AvahiInterface *i, AvahiEntry *e, gboolean unicast_response, gboolean auxiliary);
 void avahi_server_prepare_matching_responses(AvahiServer *s, AvahiInterface *i, AvahiKey *k, gboolean unicast_response);
-void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, guint16 port, gboolean legacy_unicast);
+void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, guint16 port, gboolean legacy_unicast, gboolean is_probe);
 
 void avahi_entry_group_change_state(AvahiEntryGroup *g, AvahiEntryGroupState state);