1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
Upstream CUPS issue when building with out dnssd/avahi
https://www.cups.org/str.php?L4408+P-1+S-2+C0+I0+E0+Q
Upstream-Status: Backport [STR #4402]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
--- a/scheduler/dirsvc.c 2014-03-05 13:11:32.000000000 -0800
+++ b/shceduler/dirsvc.c 2014-05-19 11:33:51.743124614 -0700
@@ -50,6 +50,9 @@
static void update_lpd(int onoff);
static void update_smb(int onoff);
+static void deregister_all_printers(int from_callback);
+static void register_all_printers(int from_callback);
+
#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
# ifdef __APPLE__
@@ -60,12 +63,10 @@
# ifdef HAVE_AVAHI
static void dnssdClientCallback(AvahiClient *c, AvahiClientState state, void *userdata);
# endif /* HAVE_AVAHI */
-static void dnssdDeregisterAllPrinters(int from_callback);
static void dnssdDeregisterInstance(cupsd_srv_t *srv, int from_callback);
static void dnssdDeregisterPrinter(cupsd_printer_t *p, int clear_name, int from_callback);
static const char *dnssdErrorString(int error);
static void dnssdFreeTxtRecord(cupsd_txt_t *txt);
-static void dnssdRegisterAllPrinters(int from_callback);
# ifdef HAVE_DNSSD
static void dnssdRegisterCallback(DNSServiceRef sdRef,
DNSServiceFlags flags,
@@ -241,7 +242,7 @@
* Register the individual printers
*/
- dnssdRegisterAllPrinters(0);
+ register_all_printers(0);
}
@@ -259,7 +260,7 @@
* De-register the individual printers
*/
- dnssdDeregisterAllPrinters(0);
+ deregister_all_printers(0);
/*
* Shut down browsing sockets...
@@ -579,7 +580,7 @@
* Register the individual printers
*/
- dnssdRegisterAllPrinters(1);
+ register_all_printers(1);
break;
case AVAHI_CLIENT_FAILURE:
@@ -591,7 +592,7 @@
* Unregister everything and close the client...
*/
- dnssdDeregisterAllPrinters(1);
+ deregister_all_printers(1);
dnssdDeregisterInstance(&WebIFSrv, 1);
avahi_client_free(DNSSDClient);
DNSSDClient = NULL;
@@ -631,28 +632,6 @@
/*
- * 'dnssdDeregisterAllPrinters()' - Deregister all printers.
- */
-
-static void
-dnssdDeregisterAllPrinters(
- int from_callback) /* I - Deregistering because of callback? */
-{
- cupsd_printer_t *p; /* Current printer */
-
-
- if (!DNSSDMaster)
- return;
-
- for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
- p;
- p = (cupsd_printer_t *)cupsArrayNext(Printers))
- if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_SCANNER)))
- dnssdDeregisterPrinter(p, 1, from_callback);
-}
-
-
-/*
* 'dnssdDeregisterInstance()' - Deregister a DNS-SD service instance.
*/
@@ -858,27 +837,6 @@
/*
- * 'dnssdRegisterAllPrinters()' - Register all printers.
- */
-
-static void
-dnssdRegisterAllPrinters(int from_callback) /* I - Called from callback? */
-{
- cupsd_printer_t *p; /* Current printer */
-
-
- if (!DNSSDMaster)
- return;
-
- for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
- p;
- p = (cupsd_printer_t *)cupsArrayNext(Printers))
- if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_SCANNER)))
- dnssdRegisterPrinter(p, from_callback);
-}
-
-
-/*
* 'dnssdRegisterCallback()' - DNSServiceRegister callback.
*/
@@ -1813,6 +1771,61 @@
}
+/*
+ * 'deregister_all_printers()' - Deregister all printers.
+ */
+
+static void
+deregister_all_printers(
+ int from_callback) /* I - Deregistering because of callback? */
+{
+ cupsd_printer_t *p; /* Current printer */
+
+
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ if (!DNSSDMaster)
+ return;
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+ for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+ p;
+ p = (cupsd_printer_t *)cupsArrayNext(Printers))
+ if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_SCANNER)))
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ dnssdDeregisterPrinter(p, 1, from_callback);
+#else
+ cupsdDeregisterPrinter(p, 1);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+}
+
+
+/*
+ * 'register_all_printers()' - Register all printers.
+ */
+
+static void
+register_all_printers(int from_callback) /* I - Called from callback? */
+{
+ cupsd_printer_t *p; /* Current printer */
+
+
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ if (!DNSSDMaster)
+ return;
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+ for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+ p;
+ p = (cupsd_printer_t *)cupsArrayNext(Printers))
+ if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_SCANNER)))
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ dnssdRegisterPrinter(p, from_callback);
+#else
+ cupsdRegisterPrinter(p);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+}
+
+
/*
* End of "$Id: dirsvc.c 11688 2014-03-05 21:11:32Z msweet $".
*/
|
