| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Mon, 25 Apr 2016 23:38:13 -0700 | |
| changeset 5890 | e3686c085735 |
| parent 5257 | 0da26ce015ab |
| permissions | -rw-r--r-- |
|
5257
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
1 |
Source: Desktop consolidation |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
Upstream promotion status: unknown |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
--- /usr/tmp/clean/avahi-0.6.28/avahi-core/internal.h 2010-08-26 01:51:38.988153000 +0100 |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ avahi-0.6.28/avahi-core/internal.h 2011-01-20 12:06:07.798532060 +0000 |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -22,6 +22,10 @@ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
/** A locally registered DNS resource record */ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
typedef struct AvahiEntry AvahiEntry; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
+#ifdef HAVE_BONJOUR |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
+typedef struct AvahiService AvahiService; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
+#include <dns_sd.h> |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
+#endif |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
#include <avahi-common/llist.h> |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
#include <avahi-common/watch.h> |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -72,6 +76,10 @@ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
AvahiIfIndex interface; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
19 |
AvahiProtocol protocol; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
20 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
21 |
+#ifdef HAVE_BONJOUR |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
22 |
+ DNSRecordRef recordref; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
23 |
+#endif |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
24 |
+ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
25 |
AVAHI_LLIST_FIELDS(AvahiEntry, entries); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
26 |
AVAHI_LLIST_FIELDS(AvahiEntry, by_key); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
27 |
AVAHI_LLIST_FIELDS(AvahiEntry, by_group); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
28 |
@@ -97,6 +105,11 @@ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
29 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
30 |
AVAHI_LLIST_FIELDS(AvahiSEntryGroup, groups); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
31 |
AVAHI_LLIST_HEAD(AvahiEntry, entries); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
32 |
+#ifdef HAVE_BONJOUR |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
33 |
+ AVAHI_LLIST_HEAD(AvahiService, services); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
34 |
+ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
35 |
+ DNSServiceRef record_connection; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
36 |
+#endif |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
37 |
}; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
38 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
39 |
struct AvahiServer {
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
40 |
@@ -106,6 +119,10 @@ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
41 |
AvahiServerConfig config; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
42 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
43 |
AVAHI_LLIST_HEAD(AvahiEntry, entries); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
44 |
+#ifdef HAVE_BONJOUR |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
45 |
+ AVAHI_LLIST_HEAD(AvahiService, services); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
46 |
+#endif |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
47 |
+ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
48 |
AvahiHashmap *entries_by_key; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
49 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
50 |
AVAHI_LLIST_HEAD(AvahiSEntryGroup, groups); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
51 |
@@ -121,6 +138,9 @@ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
52 |
AVAHI_LLIST_HEAD(AvahiSDNSServerBrowser, dns_server_browsers); |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
53 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
54 |
int need_entry_cleanup, need_group_cleanup, need_browser_cleanup; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
55 |
+#ifdef HAVE_BONJOUR |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
56 |
+ int need_service_cleanup; |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
57 |
+#endif |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
58 |
|
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
59 |
/* Used for scheduling RR cleanup */ |
|
0da26ce015ab
22071322 Build of pkg:/system/network/avahi has to be moved from Desktop to Userland.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
60 |
AvahiTimeEvent *cleanup_time_event; |