-diff -up cups-1.7.2/scheduler/avahi.c.avahi-no-threaded cups-1.7.2/scheduler/avahi.c
---- cups-1.7.2/scheduler/avahi.c.avahi-no-threaded 2014-04-14 13:56:52.632617316 +0200
-+++ cups-1.7.2/scheduler/avahi.c 2014-04-14 13:56:52.631617331 +0200
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/Makefile cups-2.3.3/scheduler/Makefile
+--- cups-2.3.3.org/scheduler/Makefile 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/Makefile 2021-04-20 22:45:53.873155054 +0200
+@@ -12,6 +12,7 @@ include ../Makedefs
+
+ CUPSDOBJS = \
+ auth.o \
++ avahi.o \
+ banners.o \
+ cert.o \
+ classes.o \
+@@ -35,7 +36,8 @@ CUPSDOBJS = \
+ server.o \
+ statbuf.o \
+ subscriptions.o \
+- sysman.o
++ sysman.o \
++ timeout.o
+ LIBOBJS = \
+ filter.o \
+ mime.o \
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/avahi.c cups-2.3.3/scheduler/avahi.c
+--- cups-2.3.3.org/scheduler/avahi.c 1970-01-01 01:00:00.000000000 +0100
++++ cups-2.3.3/scheduler/avahi.c 2021-04-20 22:45:53.873155054 +0200
@@ -0,0 +1,441 @@
+/*
+ * "$Id$"
+/*
+ * End of "$Id$".
+ */
-diff -up cups-1.7.2/scheduler/avahi.h.avahi-no-threaded cups-1.7.2/scheduler/avahi.h
---- cups-1.7.2/scheduler/avahi.h.avahi-no-threaded 2014-04-14 13:56:52.632617316 +0200
-+++ cups-1.7.2/scheduler/avahi.h 2014-04-14 13:56:52.632617316 +0200
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/avahi.h cups-2.3.3/scheduler/avahi.h
+--- cups-2.3.3.org/scheduler/avahi.h 1970-01-01 01:00:00.000000000 +0100
++++ cups-2.3.3/scheduler/avahi.h 2021-04-20 22:45:53.873155054 +0200
@@ -0,0 +1,69 @@
+/*
+ * "$Id$"
+/*
+ * End of "$Id$".
+ */
-diff -up cups-1.7.2/scheduler/cupsd.h.avahi-no-threaded cups-1.7.2/scheduler/cupsd.h
---- cups-1.7.2/scheduler/cupsd.h.avahi-no-threaded 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7.2/scheduler/cupsd.h 2014-04-14 13:56:52.632617316 +0200
-@@ -119,6 +119,7 @@ extern const char *cups_hstrerror(int);
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/cupsd.h cups-2.3.3/scheduler/cupsd.h
+--- cups-2.3.3.org/scheduler/cupsd.h 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/cupsd.h 2021-04-20 22:45:53.873155054 +0200
+@@ -115,6 +115,7 @@ extern const char *cups_hstrerror(int);
#include "colorman.h"
#include "conf.h"
#include "banners.h"
#include "dirsvc.h"
#include "network.h"
#include "subscriptions.h"
-@@ -139,6 +140,15 @@ extern const char *cups_hstrerror(int);
+@@ -135,6 +136,15 @@ extern const char *cups_hstrerror(int);
typedef void (*cupsd_selfunc_t)(void *data);
/*
* Globals...
-@@ -165,6 +175,11 @@ VAR int Launchd VALUE(0);
- /* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
+@@ -159,6 +169,9 @@ VAR int OnDemand VALUE(0);
+ /* Launched on demand */
+ #endif /* HAVE_ONDEMAND */
+#ifdef HAVE_AVAHI
+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */
+#endif /* HAVE_AVAHI */
-+
-+
/*
* Prototypes...
-@@ -229,6 +244,17 @@ extern void cupsdStopSelect(void);
+@@ -220,3 +233,15 @@ extern void cupsdStopSelect(void);
+ /* server.c */
extern void cupsdStartServer(void);
extern void cupsdStopServer(void);
-
++
+#ifdef HAVE_AVAHI
+extern void cupsdInitTimeouts(void);
+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
+ const struct timeval *tv);
+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
+#endif /* HAVE_AVAHI */
-
- /*
- * End of "$Id: cupsd.h 10996 2013-05-29 11:51:34Z msweet $".
-diff -up cups-1.7.2/scheduler/dirsvc.c.avahi-no-threaded cups-1.7.2/scheduler/dirsvc.c
---- cups-1.7.2/scheduler/dirsvc.c.avahi-no-threaded 2014-03-05 22:11:32.000000000 +0100
-+++ cups-1.7.2/scheduler/dirsvc.c 2014-04-14 14:21:11.121344106 +0200
-@@ -195,7 +195,7 @@ cupsdStartBrowsing(void)
+\ No newline at end of file
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/dirsvc.c cups-2.3.3/scheduler/dirsvc.c
+--- cups-2.3.3.org/scheduler/dirsvc.c 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/dirsvc.c 2021-04-20 22:45:53.873155054 +0200
+@@ -190,7 +190,7 @@ cupsdStartBrowsing(void)
cupsdUpdateDNSSDName();
# else /* HAVE_AVAHI */
{
cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread.");
-@@ -206,7 +206,7 @@ cupsdStartBrowsing(void)
+@@ -201,7 +201,7 @@ cupsdStartBrowsing(void)
{
int error; /* Error code, if any */
if (DNSSDClient == NULL)
{
-@@ -217,11 +217,9 @@ cupsdStartBrowsing(void)
+@@ -212,11 +212,9 @@ cupsdStartBrowsing(void)
if (FatalErrors & CUPSD_FATAL_BROWSE)
cupsdEndProcess(getpid(), 0);
}
# endif /* HAVE_DNSSD */
}
-@@ -606,7 +604,7 @@ dnssdClientCallback(
+@@ -632,7 +630,7 @@ dnssdClientCallback(
* Renew Avahi client...
*/
if (!DNSSDClient)
{
-@@ -670,13 +668,7 @@ dnssdDeregisterInstance(
- DNSServiceRefDeallocate(*srv);
+@@ -698,17 +696,11 @@ dnssdDeregisterInstance(
+ *srv = NULL;
# else /* HAVE_AVAHI */
- if (!from_callback)
- avahi_threaded_poll_lock(DNSSDMaster);
-
- avahi_entry_group_free(*srv);
+ if (*srv)
+ {
+ avahi_entry_group_free(*srv);
+ *srv = NULL;
+ }
-
- if (!from_callback)
- avahi_threaded_poll_unlock(DNSSDMaster);
# endif /* HAVE_DNSSD */
+ }
- *srv = NULL;
-@@ -997,16 +989,10 @@ dnssdRegisterInstance(
+@@ -1027,16 +1019,10 @@ dnssdRegisterInstance(
(void)commit;
# else /* HAVE_AVAHI */
cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s",
name, dnssdErrorString(avahi_client_errno(DNSSDClient)));
return (0);
-@@ -1121,9 +1107,6 @@ dnssdRegisterInstance(
+@@ -1151,9 +1137,6 @@ dnssdRegisterInstance(
cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.",
name);
}
# endif /* HAVE_DNSSD */
if (error)
-@@ -1294,12 +1277,10 @@ dnssdStop(void)
+@@ -1324,9 +1307,6 @@ dnssdStop(void)
DNSSDMaster = NULL;
# else /* HAVE_AVAHI */
-- avahi_threaded_poll_stop(DNSSDMaster);
+- if (DNSSDMaster)
+- avahi_threaded_poll_stop(DNSSDMaster);
-
- avahi_client_free(DNSSDClient);
- DNSSDClient = NULL;
+ if (DNSSDClient)
+ {
+ avahi_client_free(DNSSDClient);
+@@ -1335,7 +1315,7 @@ dnssdStop(void)
-- avahi_threaded_poll_free(DNSSDMaster);
-+ avahi_cups_poll_free(DNSSDMaster);
- DNSSDMaster = NULL;
+ if (DNSSDMaster)
+ {
+- avahi_threaded_poll_free(DNSSDMaster);
++ avahi_cups_poll_free(DNSSDMaster);
+ DNSSDMaster = NULL;
+ }
# endif /* HAVE_DNSSD */
-
-diff -up cups-1.7.2/scheduler/dirsvc.h.avahi-no-threaded cups-1.7.2/scheduler/dirsvc.h
---- cups-1.7.2/scheduler/dirsvc.h.avahi-no-threaded 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7.2/scheduler/dirsvc.h 2014-04-14 13:56:52.633617302 +0200
-@@ -51,7 +51,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/dirsvc.h cups-2.3.3/scheduler/dirsvc.h
+--- cups-2.3.3.org/scheduler/dirsvc.h 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/dirsvc.h 2021-04-20 22:45:53.873155054 +0200
+@@ -45,7 +45,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU
VAR DNSServiceRef DNSSDMaster VALUE(NULL);
/* Master DNS-SD service reference */
# else /* HAVE_AVAHI */
/* Master polling interface for Avahi */
VAR AvahiClient *DNSSDClient VALUE(NULL);
/* Client information */
-diff -up cups-1.7.2/scheduler/main.c.avahi-no-threaded cups-1.7.2/scheduler/main.c
---- cups-1.7.2/scheduler/main.c.avahi-no-threaded 2014-04-14 13:56:52.600617782 +0200
-+++ cups-1.7.2/scheduler/main.c 2014-04-14 13:56:52.634617287 +0200
-@@ -134,6 +134,10 @@ main(int argc, /* I - Number of comm
- int launchd_idle_exit;
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/main.c cups-2.3.3/scheduler/main.c
+--- cups-2.3.3.org/scheduler/main.c 2021-04-20 22:45:53.709821838 +0200
++++ cups-2.3.3/scheduler/main.c 2021-04-20 22:45:53.873155054 +0200
+@@ -132,7 +132,10 @@ main(int argc, /* I - Number of comm
+ int service_idle_exit = 0;
/* Idle exit on select timeout? */
- #endif /* HAVE_LAUNCHD */
+ #endif /* HAVE_ONDEMAND */
+-
+#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
-@@ -583,6 +587,14 @@ main(int argc, /* I - Number of comm
+ /*
+@@ -600,6 +603,14 @@ main(int argc, /* I - Number of comm
httpInitialize();
cupsdStartServer();
/*
-@@ -904,6 +916,16 @@ main(int argc, /* I - Number of comm
+@@ -934,6 +945,16 @@ main(int argc, /* I - Number of comm
}
#endif /* __APPLE__ */
#ifndef __APPLE__
/*
* Update the network interfaces once a minute...
-@@ -1884,6 +1906,10 @@ select_timeout(int fds) /* I - Number
+@@ -1643,6 +1664,10 @@ select_timeout(int fds) /* I - Number
+ cupsd_client_t *con; /* Client information */
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 */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
-@@ -1929,6 +1955,19 @@ select_timeout(int fds) /* I - Number
+@@ -1688,6 +1713,19 @@ select_timeout(int fds) /* I - Number
}
#endif /* __APPLE__ */
/*
* Check whether we are accepting new connections...
*/
-diff -up cups-1.7.2/scheduler/Makefile.avahi-no-threaded cups-1.7.2/scheduler/Makefile
---- cups-1.7.2/scheduler/Makefile.avahi-no-threaded 2014-04-14 13:56:52.600617782 +0200
-+++ cups-1.7.2/scheduler/Makefile 2014-04-14 13:56:52.631617331 +0200
-@@ -17,6 +17,7 @@ include ../Makedefs
-
- CUPSDOBJS = \
- auth.o \
-+ avahi.o \
- banners.o \
- cert.o \
- classes.o \
-@@ -41,6 +42,7 @@ CUPSDOBJS = \
- statbuf.o \
- subscriptions.o \
- sysman.o \
-+ timeout.o \
- tls.o
- LIBOBJS = \
- filter.o \
-diff -up cups-1.7.2/scheduler/timeout.c.avahi-no-threaded cups-1.7.2/scheduler/timeout.c
---- cups-1.7.2/scheduler/timeout.c.avahi-no-threaded 2014-04-14 13:56:52.634617287 +0200
-+++ cups-1.7.2/scheduler/timeout.c 2014-04-14 13:56:52.634617287 +0200
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/timeout.c cups-2.3.3/scheduler/timeout.c
+--- cups-2.3.3.org/scheduler/timeout.c 1970-01-01 01:00:00.000000000 +0100
++++ cups-2.3.3/scheduler/timeout.c 2021-04-20 22:45:53.873155054 +0200
@@ -0,0 +1,235 @@
+/*
+ * "$Id$"
projects / packages / cups.git / blobdiff