1 diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c
2 --- cups-1.5.2/scheduler/avahi.c.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000
3 +++ cups-1.5.2/scheduler/avahi.c 2012-03-14 15:07:29.477542381 +0000
8 + * Avahi poll implementation for the CUPS scheduler.
10 + * Copyright (C) 2010, 2011 Red Hat, Inc.
12 + * Tim Waugh <twaugh@redhat.com>
14 + * Redistribution and use in source and binary forms, with or without
15 + * modification, are permitted provided that the following conditions
18 + * Redistributions of source code must retain the above copyright
19 + * notice, this list of conditions and the following disclaimer.
21 + * Redistributions in binary form must reproduce the above copyright
22 + * notice, this list of conditions and the following disclaimer in the
23 + * documentation and/or other materials provided with the distribution.
25 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
26 + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27 + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
28 + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
29 + * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
30 + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
31 + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
32 + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
34 + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
36 + * OF THE POSSIBILITY OF SUCH DAMAGE.
40 + * watch_read_cb - Read callback for file descriptor
41 + * watch_write_cb - Write callback for file descriptor
42 + * watched_fd_add_select() - Call cupsdAddSelect() as needed
43 + * watch_new() - Create a new file descriptor watch
44 + * watch_free() - Free a file descriptor watch
45 + * watch_update() - Update watched events for a file descriptor
46 + * watch_get_events() - Get events that happened for a file descriptor
47 + * timeout_cb() - Run a timed Avahi callback
48 + * timeout_new() - Set a wakeup time
49 + * timeout_update() - Update the expiration time for a timeout
50 + * timeout_free() - Free a timeout
51 + * compare_watched_fds() - Compare watched file descriptors for array sorting
52 + * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
53 + * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
54 + * avahi_cups_poll_get() - Get the abstract poll API structure
59 +#ifdef HAVE_AVAHI /* Applies to entire file... */
62 + * Include necessary headers...
67 +#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
69 +#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
72 +# include <avahi-common/timeval.h>
73 +#endif /* HAVE_AVAHI */
78 + AvahiCupsPoll *cups_poll;
81 + AvahiWatchEvent occurred;
82 + cups_array_t *watches;
83 +} cupsd_watched_fd_t;
87 + cupsd_watched_fd_t *watched_fd;
89 + AvahiWatchEvent events;
90 + AvahiWatchCallback callback;
96 + AvahiCupsPoll *cups_poll;
97 + AvahiTimeoutCallback callback;
99 + cupsd_timeout_t *cupsd_timeout;
103 + * Local functions...
106 +static AvahiWatch * watch_new(const AvahiPoll *api,
108 + AvahiWatchEvent events,
109 + AvahiWatchCallback callback,
111 +static void watch_free(AvahiWatch *watch);
112 +static void watch_update(AvahiWatch *watch,
113 + AvahiWatchEvent events);
114 +static AvahiWatchEvent watch_get_events(AvahiWatch *watch);
118 + * 'watch_read_cb' - Read callback for file descriptor
122 +watch_read_cb (void *userdata)
125 + cupsd_watched_fd_t *watched_fd = userdata;
126 + watched_fd->occurred |= AVAHI_WATCH_IN;
127 + for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
129 + watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
131 + if (watch->events & watched_fd->occurred)
133 + (watch->callback) (watch, watched_fd->fd,
134 + AVAHI_WATCH_IN, watch->userdata);
135 + watched_fd->occurred &= ~AVAHI_WATCH_IN;
143 + * 'watch_write_cb' - Write callback for file descriptor
147 +watch_write_cb (void *userdata)
150 + cupsd_watched_fd_t *watched_fd = userdata;
151 + watched_fd->occurred |= AVAHI_WATCH_OUT;
152 + for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
154 + watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
156 + if (watch->events & watched_fd->occurred)
158 + (watch->callback) (watch, watched_fd->fd,
159 + AVAHI_WATCH_OUT, watch->userdata);
160 + watched_fd->occurred &= ~AVAHI_WATCH_OUT;
168 + * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
171 +static int /* O - Watches? */
172 +watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
175 + cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
176 + int any_watches = 0;
178 + for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
180 + watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
183 + if (watch->events & (AVAHI_WATCH_IN |
187 + read_cb = (cupsd_selfunc_t)watch_read_cb;
188 + if (write_cb != NULL)
192 + if (watch->events & AVAHI_WATCH_OUT)
194 + write_cb = (cupsd_selfunc_t)watch_write_cb;
195 + if (read_cb != NULL)
200 + if (read_cb || write_cb)
201 + cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
203 + cupsdRemoveSelect (watched_fd->fd);
205 + return (any_watches);
209 + * 'watch_new' - Create a new file descriptor watch
213 +watch_new (const AvahiPoll *api,
215 + AvahiWatchEvent events,
216 + AvahiWatchCallback callback,
219 + cupsd_watched_fd_t key, *watched_fd;
220 + AvahiCupsPoll *cups_poll = api->userdata;
221 + AvahiWatch *watch = malloc(sizeof(AvahiWatch));
225 + watch->events = events;
226 + watch->callback = callback;
227 + watch->userdata = userdata;
230 + watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
231 + if (watched_fd == NULL)
233 + watched_fd = malloc(sizeof(cupsd_watched_fd_t));
234 + if (watched_fd == NULL)
240 + watched_fd->fd = fd;
241 + watched_fd->occurred = 0;
242 + watched_fd->cups_poll = cups_poll;
243 + watched_fd->watches = cupsArrayNew (NULL, NULL);
244 + cupsArrayAdd (cups_poll->watched_fds, watched_fd);
247 + watch->watched_fd = watched_fd;
248 + cupsArrayAdd(watched_fd->watches, watch);
249 + watched_fd_add_select (watched_fd);
255 + * 'watch_free' - Free a file descriptor watch
259 +watch_free (AvahiWatch *watch)
261 + cupsd_watched_fd_t *watched_fd = watch->watched_fd;
262 + AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
264 + cupsArrayRemove (watched_fd->watches, watch);
267 + if (!watched_fd_add_select (watched_fd))
269 + /* No more watches */
270 + cupsArrayRemove (cups_poll->watched_fds, watched_fd);
277 + * 'watch_update' - Update watched events for a file descriptor
281 +watch_update (AvahiWatch *watch,
282 + AvahiWatchEvent events)
284 + watch->events = events;
285 + watched_fd_add_select (watch->watched_fd);
290 + * 'watch_get_events' - Get events that happened for a file descriptor
293 +static AvahiWatchEvent
294 +watch_get_events (AvahiWatch *watch)
296 + return (watch->watched_fd->occurred);
301 + * 'timeout_cb()' - Run a timed Avahi callback
305 +timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
307 + AvahiTimeout *timeout = userdata;
308 + (timeout->callback) (timeout, timeout->userdata);
313 + * 'timeout_new' - Set a wakeup time
316 +static AvahiTimeout *
317 +timeout_new (const AvahiPoll *api,
318 + const struct timeval *tv,
319 + AvahiTimeoutCallback callback,
322 + AvahiTimeout *timeout;
323 + AvahiCupsPoll *cups_poll = api->userdata;
325 + timeout = malloc(sizeof(AvahiTimeout));
326 + if (timeout == NULL)
329 + timeout->cups_poll = cups_poll;
330 + timeout->callback = callback;
331 + timeout->userdata = userdata;
332 + timeout->cupsd_timeout = cupsdAddTimeout (tv,
333 + (cupsd_timeoutfunc_t)timeout_cb,
335 + cupsArrayAdd (cups_poll->timeouts, timeout);
341 + * 'timeout_update' - Update the expiration time for a timeout
345 +timeout_update (AvahiTimeout *timeout,
346 + const struct timeval *tv)
348 + cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
353 + * ' timeout_free' - Free a timeout
357 +timeout_free (AvahiTimeout *timeout)
359 + cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
360 + cupsdRemoveTimeout (timeout->cupsd_timeout);
366 + * 'compare_watched_fds' - Compare watched file descriptors for array sorting
369 +compare_watched_fds(cupsd_watched_fd_t *p0,
370 + cupsd_watched_fd_t *p1)
373 + * Compare by fd (no two elements have the same fd)
376 + if (p0->fd == p1->fd)
379 + return (p0->fd < p1->fd ? -1 : 1);
384 + * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
388 +avahi_cups_poll_new (void)
390 + AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
391 + if (cups_poll == NULL)
394 + cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
396 + cups_poll->timeouts = cupsArrayNew (NULL, NULL);
398 + cups_poll->api.userdata = cups_poll;
399 + cups_poll->api.watch_new = watch_new;
400 + cups_poll->api.watch_free = watch_free;
401 + cups_poll->api.watch_update = watch_update;
402 + cups_poll->api.watch_get_events = watch_get_events;
404 + cups_poll->api.timeout_new = timeout_new;
405 + cups_poll->api.timeout_update = timeout_update;
406 + cups_poll->api.timeout_free = timeout_free;
408 + return (cups_poll);
413 + * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
416 +avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
418 + cupsd_watched_fd_t *watched_fd;
420 + for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
422 + watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds))
423 + cupsArrayClear (watched_fd->watches);
425 + cupsArrayClear (cups_poll->watched_fds);
426 + cupsArrayClear (cups_poll->timeouts);
431 + * 'avahi_cups_poll_get' - Get the abstract poll API structure
435 +avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
437 + return (&cups_poll->api);
441 +#endif /* HAVE_AVAHI ... from top of file */
446 diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h
447 --- cups-1.5.2/scheduler/avahi.h.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000
448 +++ cups-1.5.2/scheduler/avahi.h 2012-03-14 15:07:29.477542381 +0000
453 + * Avahi poll implementation for the CUPS scheduler.
455 + * Copyright (C) 2010, 2011 Red Hat, Inc.
457 + * Tim Waugh <twaugh@redhat.com>
459 + * Redistribution and use in source and binary forms, with or without
460 + * modification, are permitted provided that the following conditions
463 + * Redistributions of source code must retain the above copyright
464 + * notice, this list of conditions and the following disclaimer.
466 + * Redistributions in binary form must reproduce the above copyright
467 + * notice, this list of conditions and the following disclaimer in the
468 + * documentation and/or other materials provided with the distribution.
470 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
471 + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
472 + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
473 + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
474 + * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
475 + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
476 + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
477 + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
478 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
479 + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
480 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
481 + * OF THE POSSIBILITY OF SUCH DAMAGE.
487 +# include <avahi-client/client.h>
488 +# include <avahi-client/publish.h>
489 +#endif /* HAVE_AVAHI */
491 +#ifdef HAVE_AUTHORIZATION_H
492 +# include <Security/Authorization.h>
493 +#endif /* HAVE_AUTHORIZATION_H */
500 + cups_array_t *watched_fds;
501 + cups_array_t *timeouts;
503 +#endif /* HAVE_AVAHI */
510 +extern AvahiCupsPoll * avahi_cups_poll_new(void);
511 +extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
512 +extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
513 +#endif /* HAVE_AVAHI */
519 diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile
520 --- cups-1.5.2/scheduler/Makefile.avahi-4-poll 2012-03-14 15:06:36.508476980 +0000
521 +++ cups-1.5.2/scheduler/Makefile 2012-03-14 15:07:29.476542380 +0000
522 @@ -17,6 +17,7 @@ include ../Makedefs