1 11510 padraig --- /usr/tmp/clean/avahi-0.6.10/avahi-core/internal.h 2006-02-20 16:20:39.000000000 +0000 2 11510 padraig +++ avahi-0.6.10/avahi-core/internal.h 2006-05-25 16:55:38.318495000 +0100 3 11510 padraig @@ -24,6 +24,10 @@ 4 11510 padraig 5 11510 padraig /** A locally registered DNS resource record */ 6 11510 padraig typedef struct AvahiEntry AvahiEntry; 7 11510 padraig +#ifdef HAVE_BONJOUR 8 11510 padraig +typedef struct AvahiService AvahiService; 9 11510 padraig +#include <dns_sd.h> 10 11510 padraig +#endif 11 11510 padraig 12 11510 padraig #include <avahi-common/llist.h> 13 11510 padraig #include <avahi-common/watch.h> 14 11510 padraig @@ -73,6 +77,10 @@ 15 11510 padraig AvahiIfIndex interface; 16 11510 padraig AvahiProtocol protocol; 17 11510 padraig 18 11510 padraig +#ifdef HAVE_BONJOUR 19 11510 padraig + DNSRecordRef recordref; 20 11510 padraig +#endif 21 11510 padraig + 22 11510 padraig AVAHI_LLIST_FIELDS(AvahiEntry, entries); 23 11510 padraig AVAHI_LLIST_FIELDS(AvahiEntry, by_key); 24 11510 padraig AVAHI_LLIST_FIELDS(AvahiEntry, by_group); 25 11510 padraig @@ -98,6 +106,11 @@ 26 11510 padraig 27 11510 padraig AVAHI_LLIST_FIELDS(AvahiSEntryGroup, groups); 28 11510 padraig AVAHI_LLIST_HEAD(AvahiEntry, entries); 29 11510 padraig +#ifdef HAVE_BONJOUR 30 11510 padraig + AVAHI_LLIST_HEAD(AvahiService, services); 31 11510 padraig + 32 11510 padraig + DNSServiceRef record_connection; 33 11510 padraig +#endif 34 11510 padraig }; 35 11510 padraig 36 11510 padraig struct AvahiServer { 37 11510 padraig @@ -107,6 +120,10 @@ 38 11510 padraig AvahiServerConfig config; 39 11510 padraig 40 11510 padraig AVAHI_LLIST_HEAD(AvahiEntry, entries); 41 11510 padraig +#ifdef HAVE_BONJOUR 42 11510 padraig + AVAHI_LLIST_HEAD(AvahiService, services); 43 11510 padraig +#endif 44 11510 padraig + 45 11510 padraig AvahiHashmap *entries_by_key; 46 11510 padraig 47 11510 padraig AVAHI_LLIST_HEAD(AvahiSEntryGroup, groups); 48 11510 padraig @@ -122,6 +139,10 @@ 49 11510 padraig AVAHI_LLIST_HEAD(AvahiSDNSServerBrowser, dns_server_browsers); 50 11510 padraig 51 11510 padraig int need_entry_cleanup, need_group_cleanup, need_browser_cleanup; 52 11510 padraig +#ifdef HAVE_BONJOUR 53 11510 padraig + int need_service_cleanup; 54 11510 padraig + AvahiTimeEvent *cleanup_time_event; 55 11510 padraig +#endif 56 11510 padraig 57 11510 padraig AvahiTimeEventQueue *time_event_queue; 58 11510 padraig 59