* Show some messages when pygtk or twisted is missing for the execution of the python...

[catta] / avahi-core / server.h

diff --git a/avahi-core/server.h b/avahi-core/server.h
index ad8576df264f6364133595d26a8602ed01505074..7049f58970077097e3ab74fe07eb075a4e39a789 100644 (file)
--- a/avahi-core/server.h
+++ b/avahi-core/server.h
@@ -55,8 +55,8 @@ struct AvahiEntry {
     
     AvahiEntryFlags flags;
     AvahiRecord *record;
-    gint interface;
-    guchar protocol;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 
     AVAHI_LLIST_FIELDS(AvahiEntry, entries);
     AVAHI_LLIST_FIELDS(AvahiEntry, by_key);
@@ -75,6 +75,10 @@ struct AvahiEntryGroup {
 
     guint n_probing;
     
+    guint n_register_try;
+    GTimeVal register_time;
+    AvahiTimeEvent *register_time_event;
+    
     AVAHI_LLIST_FIELDS(AvahiEntryGroup, groups);
     AVAHI_LLIST_HEAD(AvahiEntry, entries);
 };
@@ -121,8 +125,6 @@ struct AvahiServer {
     AvahiEntryGroup *browse_domain_entry_group;
     guint n_host_rr_pending;
 
-    AvahiTimeEvent *register_time_event;
-    
     /* Used for assembling responses */
     AvahiRecordList *record_list;
 
@@ -133,11 +135,11 @@ struct AvahiServer {
 
 gboolean avahi_server_entry_match_interface(AvahiEntry *e, AvahiInterface *i);
 
-void avahi_server_post_query(AvahiServer *s, gint interface, guchar protocol, AvahiKey *key);
+void avahi_server_post_query(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, AvahiKey *key);
 
 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);