Updated avahi patches.
This commit is contained in:
Tim Waugh
parent
1a668d884a
commit
e6c38fe3de
42
cups-avahi-1-config.patch
Normal file
42
cups-avahi-1-config.patch
Normal file
@ -0,0 +1,42 @@
|
||||
diff -up cups-1.4.7/config.h.in.avahi-1-config cups-1.4.7/config.h.in
|
||||
--- cups-1.4.7/config.h.in.avahi-1-config 2011-01-10 07:39:37.000000000 +0000
|
||||
+++ cups-1.4.7/config.h.in 2011-06-28 12:53:16.860630055 +0100
|
||||
@@ -345,6 +345,13 @@
|
||||
|
||||
|
||||
/*
|
||||
+ * Do we have Avahi for DNS Service Discovery?
|
||||
+ */
|
||||
+
|
||||
+#undef HAVE_AVAHI
|
||||
+
|
||||
+
|
||||
+/*
|
||||
* Do we have <sys/ioctl.h>?
|
||||
*/
|
||||
|
||||
diff -up cups-1.4.7/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.4.7/config-scripts/cups-dnssd.m4
|
||||
--- cups-1.4.7/config-scripts/cups-dnssd.m4.avahi-1-config 2009-08-28 23:54:34.000000000 +0100
|
||||
+++ cups-1.4.7/config-scripts/cups-dnssd.m4 2011-06-28 12:53:16.860630055 +0100
|
||||
@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn
|
||||
DNSSDLIBS=""
|
||||
DNSSD_BACKEND=""
|
||||
|
||||
+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no],
|
||||
+ [if test x$enable_avahi = xyes; then
|
||||
+ AC_MSG_CHECKING(for Avahi)
|
||||
+ if $PKGCONFIG --exists avahi-client; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
|
||||
+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
|
||||
+ DNSSD_BACKEND="dnssd"
|
||||
+ AC_DEFINE(HAVE_AVAHI)
|
||||
+ enable_dnssd=no
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ fi
|
||||
+ fi])
|
||||
+
|
||||
if test x$enable_dnssd != xno; then
|
||||
AC_CHECK_HEADER(dns_sd.h, [
|
||||
case "$uname" in
|
||||
1096
cups-avahi-2-backend.patch
Normal file
1096
cups-avahi-2-backend.patch
Normal file
File diff suppressed because it is too large
Load Diff
337
cups-avahi-3-timeouts.patch
Normal file
337
cups-avahi-3-timeouts.patch
Normal file
@ -0,0 +1,337 @@
|
||||
diff -up cups-1.4.7/scheduler/cupsd.h.avahi-3-timeouts cups-1.4.7/scheduler/cupsd.h
|
||||
--- cups-1.4.7/scheduler/cupsd.h.avahi-3-timeouts 2011-01-11 07:05:58.000000000 +0000
|
||||
+++ cups-1.4.7/scheduler/cupsd.h 2011-06-28 12:54:06.906728322 +0100
|
||||
@@ -147,6 +147,15 @@ extern const char *cups_hstrerror(int);
|
||||
|
||||
typedef void (*cupsd_selfunc_t)(void *data);
|
||||
|
||||
+#ifdef HAVE_AVAHI
|
||||
+/*
|
||||
+ * Timeout callback function type...
|
||||
+ */
|
||||
+
|
||||
+typedef struct _cupsd_timeout_s cupsd_timeout_t;
|
||||
+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
|
||||
/*
|
||||
* Globals...
|
||||
@@ -188,6 +197,9 @@ VAR PSQUpdateQuotaProcPtr PSQUpdateQuota
|
||||
/* Apple PrintService quota function */
|
||||
#endif /* __APPLE__ && HAVE_DLFCN_H */
|
||||
|
||||
+#ifdef HAVE_AVAHI
|
||||
+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */
|
||||
+#endif /* HAVE_AVAHI */
|
||||
|
||||
|
||||
|
||||
@@ -241,6 +253,18 @@ extern void cupsdRemoveSelect(int fd);
|
||||
extern void cupsdStartSelect(void);
|
||||
extern void cupsdStopSelect(void);
|
||||
|
||||
+#ifdef HAVE_AVAHI
|
||||
+extern void cupsdInitTimeouts(void);
|
||||
+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
|
||||
+ cupsd_timeoutfunc_t cb,
|
||||
+ void *data);
|
||||
+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
|
||||
+extern void cupsdRunTimeout (cupsd_timeout_t *timeout);
|
||||
+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout,
|
||||
+ const struct timeval *tv);
|
||||
+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
extern int cupsdRemoveFile(const char *filename);
|
||||
|
||||
|
||||
diff -up cups-1.4.7/scheduler/main.c.avahi-3-timeouts cups-1.4.7/scheduler/main.c
|
||||
--- cups-1.4.7/scheduler/main.c.avahi-3-timeouts 2011-06-28 12:51:40.307369673 +0100
|
||||
+++ cups-1.4.7/scheduler/main.c 2011-06-28 12:54:06.909728268 +0100
|
||||
@@ -161,6 +161,10 @@ main(int argc, /* I - Number of comm
|
||||
int launchd_idle_exit;
|
||||
/* Idle exit on select timeout? */
|
||||
#endif /* HAVE_LAUNCHD */
|
||||
+#ifdef HAVE_AVAHI
|
||||
+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */
|
||||
+ long tmo_delay; /* Time before it must be called */
|
||||
+#endif /* HAVE_AVAHI */
|
||||
|
||||
|
||||
#ifdef HAVE_GETEUID
|
||||
@@ -561,6 +565,14 @@ main(int argc, /* I - Number of comm
|
||||
|
||||
httpInitialize();
|
||||
|
||||
+#ifdef HAVE_AVAHI
|
||||
+ /*
|
||||
+ * Initialize timed callback structures.
|
||||
+ */
|
||||
+
|
||||
+ cupsdInitTimeouts();
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
cupsdStartServer();
|
||||
|
||||
/*
|
||||
@@ -900,6 +912,16 @@ main(int argc, /* I - Number of comm
|
||||
}
|
||||
#endif /* __APPLE__ */
|
||||
|
||||
+#ifdef HAVE_AVAHI
|
||||
+ /*
|
||||
+ * If a timed callback is due, run it.
|
||||
+ */
|
||||
+
|
||||
+ tmo = cupsdNextTimeout (&tmo_delay);
|
||||
+ if (tmo && tmo_delay == 0)
|
||||
+ cupsdRunTimeout (tmo);
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
#ifndef __APPLE__
|
||||
/*
|
||||
* Update the network interfaces once a minute...
|
||||
@@ -1925,6 +1947,10 @@ select_timeout(int fds) /* I - Number
|
||||
cupsd_job_t *job; /* Job information */
|
||||
cupsd_subscription_t *sub; /* Subscription information */
|
||||
const char *why; /* Debugging aid */
|
||||
+#ifdef HAVE_AVAHI
|
||||
+ cupsd_timeout_t *tmo; /* Timed callback */
|
||||
+ long tmo_delay; /* Seconds before calling it */
|
||||
+#endif /* HAVE_AVAHI */
|
||||
|
||||
|
||||
/*
|
||||
@@ -1967,6 +1993,19 @@ select_timeout(int fds) /* I - Number
|
||||
}
|
||||
#endif /* __APPLE__ */
|
||||
|
||||
+#ifdef HAVE_AVAHI
|
||||
+ /*
|
||||
+ * See if there are any scheduled timed callbacks to run.
|
||||
+ */
|
||||
+
|
||||
+ tmo = cupsdNextTimeout (&tmo_delay);
|
||||
+ if (tmo)
|
||||
+ {
|
||||
+ timeout = tmo_delay;
|
||||
+ why = "run a timed callback";
|
||||
+ }
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
/*
|
||||
* Check whether we are accepting new connections...
|
||||
*/
|
||||
diff -up cups-1.4.7/scheduler/Makefile.avahi-3-timeouts cups-1.4.7/scheduler/Makefile
|
||||
--- cups-1.4.7/scheduler/Makefile.avahi-3-timeouts 2011-06-28 12:51:40.475366647 +0100
|
||||
+++ cups-1.4.7/scheduler/Makefile 2011-06-28 12:54:06.906728322 +0100
|
||||
@@ -39,7 +39,8 @@ CUPSDOBJS = \
|
||||
server.o \
|
||||
statbuf.o \
|
||||
subscriptions.o \
|
||||
- sysman.o
|
||||
+ sysman.o \
|
||||
+ timeout.o
|
||||
LIBOBJS = \
|
||||
filter.o \
|
||||
mime.o \
|
||||
diff -up cups-1.4.7/scheduler/timeout.c.avahi-3-timeouts cups-1.4.7/scheduler/timeout.c
|
||||
--- cups-1.4.7/scheduler/timeout.c.avahi-3-timeouts 2011-06-28 12:54:06.910728250 +0100
|
||||
+++ cups-1.4.7/scheduler/timeout.c 2011-06-28 12:54:06.910728250 +0100
|
||||
@@ -0,0 +1,195 @@
|
||||
+/*
|
||||
+ * "$Id$"
|
||||
+ *
|
||||
+ * Timeout functions for the Common UNIX Printing System (CUPS).
|
||||
+ *
|
||||
+ * Copyright (C) 2010 Red Hat, Inc.
|
||||
+ * Authors:
|
||||
+ * Tim Waugh <twaugh@redhat.com>
|
||||
+ *
|
||||
+ * Distribution and use rights are outlined in the file "LICENSE.txt"
|
||||
+ * which should have been included with this file. If this file is
|
||||
+ * file is missing or damaged, see the license at "http://www.cups.org/".
|
||||
+ *
|
||||
+ * Contents:
|
||||
+ *
|
||||
+ * cupsdInitTimeouts() - Initialise timeout structure.
|
||||
+ * cupsdAddTimeout() - Add a timed callback.
|
||||
+ * cupsdNextTimeout() - Find the next enabled timed callback.
|
||||
+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
|
||||
+ * cupsdRemoveTimeout() - Discard a timed callback.
|
||||
+ * compare_timeouts() - Compare timed callbacks for array sorting.
|
||||
+ */
|
||||
+
|
||||
+#include <config.h>
|
||||
+
|
||||
+#ifdef HAVE_AVAHI /* Applies to entire file... */
|
||||
+
|
||||
+/*
|
||||
+ * Include necessary headers...
|
||||
+ */
|
||||
+
|
||||
+#include "cupsd.h"
|
||||
+
|
||||
+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
|
||||
+# include <malloc.h>
|
||||
+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
|
||||
+
|
||||
+#ifdef HAVE_AVAHI
|
||||
+# include <avahi-common/timeval.h>
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
+
|
||||
+struct _cupsd_timeout_s
|
||||
+{
|
||||
+ struct timeval when;
|
||||
+ int enabled;
|
||||
+ cupsd_timeoutfunc_t callback;
|
||||
+ void *data;
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Local functions...
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
|
||||
+ */
|
||||
+
|
||||
+static int
|
||||
+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
|
||||
+{
|
||||
+ if (!p0->enabled || !p1->enabled)
|
||||
+ {
|
||||
+ if (!p0->enabled && !p1->enabled)
|
||||
+ return (0);
|
||||
+
|
||||
+ return (p0->enabled ? -1 : 1);
|
||||
+ }
|
||||
+
|
||||
+ return (avahi_timeval_compare (&p0->when, &p1->when));
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
|
||||
+ */
|
||||
+
|
||||
+void
|
||||
+cupsdInitTimeouts(void)
|
||||
+{
|
||||
+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'cupsdAddTimeout()' - Add a timed callback.
|
||||
+ */
|
||||
+
|
||||
+cupsd_timeout_t * /* O - Timeout handle */
|
||||
+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */
|
||||
+ cupsd_timeoutfunc_t cb, /* I - Callback function */
|
||||
+ void *data) /* I - User data */
|
||||
+{
|
||||
+ cupsd_timeout_t *timeout;
|
||||
+
|
||||
+ timeout = malloc (sizeof(cupsd_timeout_t));
|
||||
+ if (timeout != NULL)
|
||||
+ {
|
||||
+ timeout->enabled = (tv != NULL);
|
||||
+ if (tv)
|
||||
+ {
|
||||
+ timeout->when.tv_sec = tv->tv_sec;
|
||||
+ timeout->when.tv_usec = tv->tv_usec;
|
||||
+ }
|
||||
+
|
||||
+ timeout->callback = cb;
|
||||
+ timeout->data = data;
|
||||
+ cupsArrayAdd (Timeouts, timeout);
|
||||
+ }
|
||||
+
|
||||
+ return timeout;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
|
||||
+ */
|
||||
+
|
||||
+cupsd_timeout_t * /* O - Next enabled timeout or NULL */
|
||||
+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */
|
||||
+{
|
||||
+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
|
||||
+ struct timeval curtime;
|
||||
+
|
||||
+ if (first && !first->enabled)
|
||||
+ first = NULL;
|
||||
+
|
||||
+ if (first && delay)
|
||||
+ {
|
||||
+ gettimeofday (&curtime, NULL);
|
||||
+ if (avahi_timeval_compare (&curtime, &first->when) > 0)
|
||||
+ {
|
||||
+ *delay = 0;
|
||||
+ } else {
|
||||
+ *delay = 1 + first->when.tv_sec - curtime.tv_sec;
|
||||
+ if (first->when.tv_usec < curtime.tv_usec)
|
||||
+ (*delay)--;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return (first);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'cupsdRunTimeout()' - Run a timed callback.
|
||||
+ */
|
||||
+
|
||||
+void
|
||||
+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
|
||||
+{
|
||||
+ if (!timeout)
|
||||
+ return;
|
||||
+ timeout->enabled = 0;
|
||||
+ if (!timeout->callback)
|
||||
+ return;
|
||||
+ timeout->callback (timeout, timeout->data);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
|
||||
+ */
|
||||
+
|
||||
+void
|
||||
+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */
|
||||
+ const struct timeval *tv) /* I - Absolute time or NULL */
|
||||
+{
|
||||
+ cupsArrayRemove (Timeouts, timeout);
|
||||
+ timeout->enabled = (tv != NULL);
|
||||
+ if (tv)
|
||||
+ {
|
||||
+ timeout->when.tv_sec = tv->tv_sec;
|
||||
+ timeout->when.tv_usec = tv->tv_usec;
|
||||
+ }
|
||||
+ cupsArrayAdd (Timeouts, timeout);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
|
||||
+ */
|
||||
+
|
||||
+void
|
||||
+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
|
||||
+{
|
||||
+ cupsArrayRemove (Timeouts, timeout);
|
||||
+ free (timeout);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+#endif /* HAVE_AVAHI ... from top of file */
|
||||
+
|
||||
+/*
|
||||
+ * End of "$Id$".
|
||||
+ */
|
||||
513
cups-avahi-4-poll.patch
Normal file
513
cups-avahi-4-poll.patch
Normal file
@ -0,0 +1,513 @@
|
||||
diff -up cups-1.4.7/scheduler/avahi.c.avahi-4-poll cups-1.4.7/scheduler/avahi.c
|
||||
--- cups-1.4.7/scheduler/avahi.c.avahi-4-poll 2011-06-28 12:54:34.651228409 +0100
|
||||
+++ cups-1.4.7/scheduler/avahi.c 2011-06-28 12:54:34.652228391 +0100
|
||||
@@ -0,0 +1,445 @@
|
||||
+/*
|
||||
+ * "$Id$"
|
||||
+ *
|
||||
+ * Avahi poll implementation for the CUPS scheduler.
|
||||
+ *
|
||||
+ * Copyright (C) 2010 Red Hat, Inc.
|
||||
+ * Authors:
|
||||
+ * Tim Waugh <twaugh@redhat.com>
|
||||
+ *
|
||||
+ * Distribution and use rights are outlined in the file "LICENSE.txt"
|
||||
+ * "LICENSE" which should have been included with this file. If this
|
||||
+ * file is missing or damaged, see the license at "http://www.cups.org/".
|
||||
+ *
|
||||
+ * Contents:
|
||||
+ *
|
||||
+ * watch_read_cb - Read callback for file descriptor
|
||||
+ * watch_write_cb - Write callback for file descriptor
|
||||
+ * watched_fd_add_select() - Call cupsdAddSelect() as needed
|
||||
+ * watch_new() - Create a new file descriptor watch
|
||||
+ * watch_free() - Free a file descriptor watch
|
||||
+ * watch_update() - Update watched events for a file descriptor
|
||||
+ * watch_get_events() - Get events that happened for a file descriptor
|
||||
+ * timeout_cb() - Run a timed Avahi callback
|
||||
+ * timeout_new() - Set a wakeup time
|
||||
+ * timeout_update() - Update the expiration time for a timeout
|
||||
+ * timeout_free() - Free a timeout
|
||||
+ * compare_watched_fds() - Compare watched file descriptors for array sorting
|
||||
+ * compare_timeouts() - Compare timeouts for array sorting
|
||||
+ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
|
||||
+ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
|
||||
+ * avahi_cups_poll_get() - Get the abstract poll API structure
|
||||
+ */
|
||||
+
|
||||
+#include <config.h>
|
||||
+
|
||||
+#ifdef HAVE_AVAHI /* Applies to entire file... */
|
||||
+
|
||||
+/*
|
||||
+ * Include necessary headers...
|
||||
+ */
|
||||
+
|
||||
+#include "cupsd.h"
|
||||
+
|
||||
+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
|
||||
+# include <malloc.h>
|
||||
+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
|
||||
+
|
||||
+#ifdef HAVE_AVAHI
|
||||
+# include <avahi-common/timeval.h>
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
+
|
||||
+typedef struct
|
||||
+{
|
||||
+ AvahiCupsPoll *cups_poll;
|
||||
+
|
||||
+ int fd;
|
||||
+ AvahiWatchEvent occurred;
|
||||
+ cups_array_t *watches;
|
||||
+} cupsd_watched_fd_t;
|
||||
+
|
||||
+struct AvahiWatch
|
||||
+{
|
||||
+ cupsd_watched_fd_t *watched_fd;
|
||||
+
|
||||
+ AvahiWatchEvent events;
|
||||
+ AvahiWatchCallback callback;
|
||||
+ void *userdata;
|
||||
+};
|
||||
+
|
||||
+struct AvahiTimeout
|
||||
+{
|
||||
+ AvahiCupsPoll *cups_poll;
|
||||
+ AvahiTimeoutCallback callback;
|
||||
+ void *userdata;
|
||||
+ cupsd_timeout_t *cupsd_timeout;
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Local functions...
|
||||
+ */
|
||||
+
|
||||
+static AvahiWatch * watch_new(const AvahiPoll *api,
|
||||
+ int fd,
|
||||
+ AvahiWatchEvent events,
|
||||
+ AvahiWatchCallback callback,
|
||||
+ void *userdata);
|
||||
+static void watch_free(AvahiWatch *watch);
|
||||
+static void watch_update(AvahiWatch *watch,
|
||||
+ AvahiWatchEvent events);
|
||||
+static AvahiWatchEvent watch_get_events(AvahiWatch *watch);
|
||||
+static int compare_watches(AvahiWatch *p0,
|
||||
+ AvahiWatch *p1);
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'watch_read_cb' - Read callback for file descriptor
|
||||
+ */
|
||||
+
|
||||
+static void
|
||||
+watch_read_cb (void *userdata)
|
||||
+{
|
||||
+ AvahiWatch *watch;
|
||||
+ cupsd_watched_fd_t *watched_fd = userdata;
|
||||
+ watched_fd->occurred |= AVAHI_WATCH_IN;
|
||||
+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
|
||||
+ watch;
|
||||
+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
|
||||
+ if (watch->events & watched_fd->occurred) {
|
||||
+ (watch->callback) (watch, watched_fd->fd,
|
||||
+ AVAHI_WATCH_IN, watch->userdata);
|
||||
+ watched_fd->occurred &= ~AVAHI_WATCH_IN;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'watch_write_cb' - Write callback for file descriptor
|
||||
+ */
|
||||
+
|
||||
+static void
|
||||
+watch_write_cb (void *userdata)
|
||||
+{
|
||||
+ AvahiWatch *watch;
|
||||
+ cupsd_watched_fd_t *watched_fd = userdata;
|
||||
+ watched_fd->occurred |= AVAHI_WATCH_OUT;
|
||||
+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
|
||||
+ watch;
|
||||
+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
|
||||
+ if (watch->events & watched_fd->occurred) {
|
||||
+ (watch->callback) (watch, watched_fd->fd,
|
||||
+ AVAHI_WATCH_OUT, watch->userdata);
|
||||
+ watched_fd->occurred &= ~AVAHI_WATCH_OUT;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
|
||||
+ */
|
||||
+
|
||||
+static int /* O - Watches? */
|
||||
+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
|
||||
+{
|
||||
+ AvahiWatch *watch;
|
||||
+ cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
|
||||
+
|
||||
+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
|
||||
+ watch;
|
||||
+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
|
||||
+ if (watch->events & (AVAHI_WATCH_IN |
|
||||
+ AVAHI_WATCH_ERR |
|
||||
+ AVAHI_WATCH_HUP)) {
|
||||
+ read_cb = (cupsd_selfunc_t)watch_read_cb;
|
||||
+ if (write_cb != NULL)
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ if (watch->events & AVAHI_WATCH_OUT) {
|
||||
+ write_cb = (cupsd_selfunc_t)watch_write_cb;
|
||||
+ if (read_cb != NULL)
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (read_cb || write_cb)
|
||||
+ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
|
||||
+ else
|
||||
+ cupsdRemoveSelect (watched_fd->fd);
|
||||
+
|
||||
+ return (read_cb || write_cb);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * 'watch_new' - Create a new file descriptor watch
|
||||
+ */
|
||||
+
|
||||
+static AvahiWatch *
|
||||
+watch_new (const AvahiPoll *api,
|
||||
+ int fd,
|
||||
+ AvahiWatchEvent events,
|
||||
+ AvahiWatchCallback callback,
|
||||
+ void *userdata)
|
||||
+{
|
||||
+ cupsd_watched_fd_t key, *watched_fd;
|
||||
+ AvahiCupsPoll *cups_poll = api->userdata;
|
||||
+ AvahiWatch *watch = malloc(sizeof(AvahiWatch));
|
||||
+ if (watch == NULL)
|
||||
+ return (NULL);
|
||||
+
|
||||
+ watch->events = events;
|
||||
+ watch->callback = callback;
|
||||
+ watch->userdata = userdata;
|
||||
+
|
||||
+ key.fd = fd;
|
||||
+ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
|
||||
+ if (watched_fd == NULL) {
|
||||
+ watched_fd = malloc(sizeof(cupsd_watched_fd_t));
|
||||
+ if (watched_fd == NULL) {
|
||||
+ free (watch);
|
||||
+ return (NULL);
|
||||
+ }
|
||||
+
|
||||
+ watched_fd->fd = fd;
|
||||
+ watched_fd->occurred = 0;
|
||||
+ watched_fd->cups_poll = cups_poll;
|
||||
+ watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches,
|
||||
+ NULL);
|
||||
+ }
|
||||
+
|
||||
+ watch->watched_fd = watched_fd;
|
||||
+ cupsArrayAdd(watched_fd->watches, watch);
|
||||
+ watched_fd_add_select (watched_fd);
|
||||
+ return (watch);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'watch_free' - Free a file descriptor watch
|
||||
+ */
|
||||
+
|
||||
+static void
|
||||
+watch_free (AvahiWatch *watch)
|
||||
+{
|
||||
+ cupsd_watched_fd_t *watched_fd = watch->watched_fd;
|
||||
+ AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
|
||||
+
|
||||
+ cupsArrayRemove (watched_fd->watches, watch);
|
||||
+ free (watch);
|
||||
+
|
||||
+ if (!watched_fd_add_select (watched_fd)) {
|
||||
+ /* No more watches */
|
||||
+ cupsArrayRemove (cups_poll->watched_fds, watched_fd);
|
||||
+ free (watched_fd);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'watch_update' - Update watched events for a file descriptor
|
||||
+ */
|
||||
+
|
||||
+static void
|
||||
+watch_update (AvahiWatch *watch,
|
||||
+ AvahiWatchEvent events)
|
||||
+{
|
||||
+ watch->events = events;
|
||||
+ watched_fd_add_select (watch->watched_fd);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'watch_get_events' - Get events that happened for a file descriptor
|
||||
+ */
|
||||
+
|
||||
+static AvahiWatchEvent
|
||||
+watch_get_events (AvahiWatch *watch)
|
||||
+{
|
||||
+ return (watch->watched_fd->occurred);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'compare_watches' - Compare watches for array sorting
|
||||
+ */
|
||||
+
|
||||
+static int
|
||||
+compare_watches (AvahiWatch *p0,
|
||||
+ AvahiWatch *p1)
|
||||
+{
|
||||
+ if (p0->watched_fd->fd < p1->watched_fd->fd)
|
||||
+ return (-1);
|
||||
+
|
||||
+ return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'timeout_cb()' - Run a timed Avahi callback
|
||||
+ */
|
||||
+
|
||||
+static void
|
||||
+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
|
||||
+{
|
||||
+ AvahiTimeout *timeout = userdata;
|
||||
+ (timeout->callback) (timeout, timeout->userdata);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'timeout_new' - Set a wakeup time
|
||||
+ */
|
||||
+
|
||||
+static AvahiTimeout *
|
||||
+timeout_new (const AvahiPoll *api,
|
||||
+ const struct timeval *tv,
|
||||
+ AvahiTimeoutCallback callback,
|
||||
+ void *userdata)
|
||||
+{
|
||||
+ AvahiTimeout *timeout;
|
||||
+ AvahiCupsPoll *cups_poll = api->userdata;
|
||||
+
|
||||
+ timeout = malloc(sizeof(AvahiTimeout));
|
||||
+ if (timeout == NULL)
|
||||
+ return (NULL);
|
||||
+
|
||||
+ timeout->cups_poll = cups_poll;
|
||||
+ timeout->callback = callback;
|
||||
+ timeout->userdata = userdata;
|
||||
+ timeout->cupsd_timeout = cupsdAddTimeout (tv,
|
||||
+ (cupsd_timeoutfunc_t)timeout_cb,
|
||||
+ timeout);
|
||||
+ cupsArrayAdd (cups_poll->timeouts, timeout);
|
||||
+ return (timeout);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'timeout_update' - Update the expiration time for a timeout
|
||||
+ */
|
||||
+
|
||||
+static void
|
||||
+timeout_update (AvahiTimeout *timeout,
|
||||
+ const struct timeval *tv)
|
||||
+{
|
||||
+ cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * ' timeout_free' - Free a timeout
|
||||
+ */
|
||||
+
|
||||
+static void
|
||||
+timeout_free (AvahiTimeout *timeout)
|
||||
+{
|
||||
+ cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
|
||||
+ cupsdRemoveTimeout (timeout->cupsd_timeout);
|
||||
+ free (timeout);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
|
||||
+ */
|
||||
+static int
|
||||
+compare_watched_fds(cupsd_watched_fd_t *p0,
|
||||
+ cupsd_watched_fd_t *p1)
|
||||
+{
|
||||
+ if (p0->fd != p1->fd)
|
||||
+ return (p0->fd < p1->fd ? -1 : 1);
|
||||
+
|
||||
+ if (p0 == p1)
|
||||
+ return (0);
|
||||
+
|
||||
+ return (p0 < p1 ? -1 : 1);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'compare_timeouts' - Compare timeouts for array sorting
|
||||
+ */
|
||||
+static int
|
||||
+compare_timeouts(AvahiTimeout *p0,
|
||||
+ AvahiTimeout *p1)
|
||||
+{
|
||||
+ /*
|
||||
+ * Just compare pointers to make it a stable sort.
|
||||
+ */
|
||||
+
|
||||
+ if (p0->cupsd_timeout < p1->cupsd_timeout)
|
||||
+ return (-1);
|
||||
+ return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
|
||||
+ */
|
||||
+
|
||||
+AvahiCupsPoll *
|
||||
+avahi_cups_poll_new (void)
|
||||
+{
|
||||
+ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
|
||||
+ if (cups_poll == NULL)
|
||||
+ return (NULL);
|
||||
+
|
||||
+ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
|
||||
+ NULL);
|
||||
+ cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts,
|
||||
+ NULL);
|
||||
+
|
||||
+ cups_poll->api.userdata = cups_poll;
|
||||
+ cups_poll->api.watch_new = watch_new;
|
||||
+ cups_poll->api.watch_free = watch_free;
|
||||
+ cups_poll->api.watch_update = watch_update;
|
||||
+ cups_poll->api.watch_get_events = watch_get_events;
|
||||
+
|
||||
+ cups_poll->api.timeout_new = timeout_new;
|
||||
+ cups_poll->api.timeout_update = timeout_update;
|
||||
+ cups_poll->api.timeout_free = timeout_free;
|
||||
+
|
||||
+ return (cups_poll);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
|
||||
+ */
|
||||
+void
|
||||
+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
|
||||
+{
|
||||
+ cupsd_watched_fd_t *watched_fd;
|
||||
+
|
||||
+ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
|
||||
+ watched_fd;
|
||||
+ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){
|
||||
+ cupsArrayClear (watched_fd->watches);
|
||||
+ }
|
||||
+
|
||||
+ cupsArrayClear (cups_poll->watched_fds);
|
||||
+ cupsArrayClear (cups_poll->timeouts);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
|
||||
+ */
|
||||
+
|
||||
+const AvahiPoll *
|
||||
+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
|
||||
+{
|
||||
+ return (&cups_poll->api);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+#endif /* HAVE_AVAHI ... from top of file */
|
||||
+
|
||||
+/*
|
||||
+ * End of "$Id$".
|
||||
+ */
|
||||
diff -up cups-1.4.7/scheduler/avahi.h.avahi-4-poll cups-1.4.7/scheduler/avahi.h
|
||||
--- cups-1.4.7/scheduler/avahi.h.avahi-4-poll 2011-06-28 12:54:34.658228283 +0100
|
||||
+++ cups-1.4.7/scheduler/avahi.h 2011-06-28 12:54:34.658228283 +0100
|
||||
@@ -0,0 +1,49 @@
|
||||
+/*
|
||||
+ * "$Id$"
|
||||
+ *
|
||||
+ * Avahi poll implementation for the CUPS scheduler.
|
||||
+ *
|
||||
+ * Copyright (C) 2010 Red Hat, Inc.
|
||||
+ * Authors:
|
||||
+ * Tim Waugh <twaugh@redhat.com>
|
||||
+ *
|
||||
+ * Distribution and use rights are outlined in the file "LICENSE.txt"
|
||||
+ * which should have been included with this file. If this file is
|
||||
+ * file is missing or damaged, see the license at "http://www.cups.org/".
|
||||
+ */
|
||||
+
|
||||
+#include <config.h>
|
||||
+
|
||||
+#ifdef HAVE_AVAHI
|
||||
+# include <avahi-client/client.h>
|
||||
+# include <avahi-client/publish.h>
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
+#ifdef HAVE_AUTHORIZATION_H
|
||||
+# include <Security/Authorization.h>
|
||||
+#endif /* HAVE_AUTHORIZATION_H */
|
||||
+
|
||||
+
|
||||
+#ifdef HAVE_AVAHI
|
||||
+typedef struct
|
||||
+{
|
||||
+ AvahiPoll api;
|
||||
+ cups_array_t *watched_fds;
|
||||
+ cups_array_t *timeouts;
|
||||
+} AvahiCupsPoll;
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
+/*
|
||||
+ * Prototypes...
|
||||
+ */
|
||||
+
|
||||
+#ifdef HAVE_AVAHI
|
||||
+extern AvahiCupsPoll * avahi_cups_poll_new(void);
|
||||
+extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
|
||||
+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
|
||||
+#endif /* HAVE_AVAHI */
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * End of "$Id$".
|
||||
+ */
|
||||
diff -up cups-1.4.7/scheduler/Makefile.avahi-4-poll cups-1.4.7/scheduler/Makefile
|
||||
--- cups-1.4.7/scheduler/Makefile.avahi-4-poll 2011-06-28 12:54:06.906728322 +0100
|
||||
+++ cups-1.4.7/scheduler/Makefile 2011-06-28 12:54:34.651228409 +0100
|
||||
@@ -17,6 +17,7 @@ include ../Makedefs
|
||||
|
||||
CUPSDOBJS = \
|
||||
auth.o \
|
||||
+ avahi.o \
|
||||
banners.o \
|
||||
cert.o \
|
||||
classes.o \
|
||||
1606
cups-avahi-5-services.patch
Normal file
1606
cups-avahi-5-services.patch
Normal file
File diff suppressed because it is too large
Load Diff
3447
cups-avahi.patch
3447
cups-avahi.patch
File diff suppressed because it is too large
Load Diff
27
cups.spec
27
cups.spec
@ -13,7 +13,7 @@
|
||||
Summary: Common Unix Printing System
|
||||
Name: cups
|
||||
Version: 1.4.7
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Daemons
|
||||
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
||||
@ -71,8 +71,13 @@ Patch32: cups-texttops-rotate-page.patch
|
||||
Patch33: cups-usb-parallel.patch
|
||||
Patch34: cups-str3535.patch
|
||||
|
||||
Patch40: cups-avahi.patch
|
||||
Patch41: cups-icc.patch
|
||||
Patch40: cups-avahi-1-config.patch
|
||||
Patch41: cups-avahi-2-backend.patch
|
||||
Patch42: cups-avahi-3-timeouts.patch
|
||||
Patch43: cups-avahi-4-poll.patch
|
||||
Patch44: cups-avahi-5-services.patch
|
||||
|
||||
Patch45: cups-icc.patch
|
||||
|
||||
Patch100: cups-lspp.patch
|
||||
|
||||
@ -283,10 +288,17 @@ module.
|
||||
# Set the default RIPCache to 128m (STR #3535, bug #549901).
|
||||
%patch34 -p1 -b .str3535
|
||||
|
||||
# Avahi support in the dnssd backend.
|
||||
%patch40 -p1 -b .avahi
|
||||
# Avahi support:
|
||||
# - discovery in the dnssd backend
|
||||
# - service announcement in the scheduler
|
||||
%patch40 -p1 -b .avahi-1-config
|
||||
%patch41 -p1 -b .avahi-2-backend
|
||||
%patch42 -p1 -b .avahi-3-timeouts
|
||||
%patch43 -p1 -b .avahi-4-poll
|
||||
%patch44 -p1 -b .avahi-5-services
|
||||
|
||||
# ICC colord support.
|
||||
%patch41 -p1 -b .icc
|
||||
%patch45 -p1 -b .icc
|
||||
|
||||
%if %lspp
|
||||
# LSPP support.
|
||||
@ -606,6 +618,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{php_extdir}/phpcups.so
|
||||
|
||||
%changelog
|
||||
* Tue Jun 28 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.7-2
|
||||
- Updated avahi patches.
|
||||
|
||||
* Tue Jun 28 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.7-1
|
||||
- 1.4.7.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user