*
* AppSocket backend for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007-2008 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
main(int argc, /* I - Number of command-line arguments (6 or 7) */
char *argv[]) /* I - Command-line arguments */
{
- char method[255], /* Method in URI */
+ const char *device_uri; /* Device URI */
+ char scheme[255], /* Scheme in URI */
hostname[1024], /* Hostname */
username[255], /* Username info (not used) */
resource[1024], /* Resource info (not used) */
int print_fd; /* Print file */
int copies; /* Number of copies to print */
time_t start_time; /* Time of first connect */
- int recoverable; /* Recoverable error shown? */
+#ifdef __APPLE__
+ time_t current_time, /* Current time */
+ wait_time; /* Time to wait before shutting down socket */
+#endif /* __APPLE__ */
int contimeout; /* Connection timeout */
int waiteof; /* Wait for end-of-file? */
int port; /* Port number */
char addrname[256]; /* Address name */
int snmp_fd, /* SNMP socket */
start_count, /* Page count via SNMP at start */
- page_count; /* Page count via SNMP */
+ page_count, /* Page count via SNMP */
+ have_supplies; /* Printer supports supply levels? */
ssize_t tbytes; /* Total number of bytes written */
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
if (argc == 1)
{
- puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
+ printf("network socket \"Unknown\" \"%s\"\n",
+ _cupsLangString(cupsLangDefault(), _("AppSocket/HP JetDirect")));
return (CUPS_BACKEND_OK);
}
else if (argc < 6 || argc > 7)
* Extract the hostname and port number from the URI...
*/
- httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
- method, sizeof(method), username, sizeof(username),
- hostname, sizeof(hostname), &port,
+ if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
+ return (CUPS_BACKEND_FAILED);
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+ username, sizeof(username), hostname, sizeof(hostname), &port,
resource, sizeof(resource));
if (port == 0)
* Then try to connect to the remote host...
*/
- recoverable = 0;
- start_time = time(NULL);
+ start_time = time(NULL);
sprintf(portname, "%d", port);
+ fputs("STATE: +connecting-to-device\n", stderr);
+ fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
{
- _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
hostname);
return (CUPS_BACKEND_STOP);
}
- _cupsLangPrintf(stderr,
- _("INFO: Attempting to connect to host %s on port %d\n"),
- hostname, port);
-
- fputs("STATE: +connecting-to-device\n", stderr);
+ fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+ _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));
for (delay = 5;;)
{
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+ _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
return (CUPS_BACKEND_FAILED);
}
- recoverable = 1;
-
_cupsLangPrintf(stderr,
- _("WARNING: recoverable: Network host \'%s\' is busy; "
- "will retry in %d seconds...\n"),
- hostname, delay);
+ _("WARNING: Network host \'%s\' is busy; will retry in "
+ "%d seconds...\n"), hostname, delay);
sleep(delay);
}
else
{
- recoverable = 1;
-
_cupsLangPrintf(stderr, "DEBUG: Connection error: %s\n",
strerror(errno));
_cupsLangPuts(stderr,
- _("ERROR: recoverable: Unable to connect to printer; "
- "will retry in 30 seconds...\n"));
+ _("ERROR: Unable to connect to printer; will retry in 30 "
+ "seconds...\n"));
sleep(30);
}
}
break;
}
- if (recoverable)
- {
- /*
- * If we've shown a recoverable error make sure the printer proxies
- * have a chance to see the recovered message. Not pretty but
- * necessary for now...
- */
-
- fputs("INFO: recovered: \n", stderr);
- sleep(5);
- }
-
fputs("STATE: -connecting-to-device\n", stderr);
- _cupsLangPrintf(stderr, _("INFO: Connected to %s...\n"), hostname);
+ _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
#ifdef AF_INET6
if (addr->addr.addr.sa_family == AF_INET6)
if ((snmp_fd = _cupsSNMPOpen(addr->addr.addr.sa_family)) >= 0)
{
- if (backendSNMPSupplies(snmp_fd, &(addr->addr), &start_count, NULL))
- {
- /*
- * No, close it...
- */
-
- _cupsSNMPClose(snmp_fd);
- snmp_fd = -1;
- }
+ have_supplies = !backendSNMPSupplies(snmp_fd, &(addr->addr), &start_count,
+ NULL);
}
else
- start_count = 0;
+ have_supplies = start_count = 0;
/*
* Print everything...
lseek(print_fd, 0, SEEK_SET);
}
- tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1,
+ tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1, 0,
backendNetworkSideCB);
if (print_fd != 0 && tbytes >= 0)
CUPS_LLCAST tbytes);
}
+#ifdef __APPLE__
/*
- * Get any pending back-channel data...
+ * Wait up to 5 seconds to get any pending back-channel data...
*/
- while (wait_bc(device_fd, 5) > 0);
+ wait_time = time(NULL) + 5;
+ while (wait_time >= time(¤t_time))
+ if (wait_bc(device_fd, wait_time - current_time) <= 0)
+ break;
+#endif /* __APPLE__ */
if (waiteof)
{
* Collect the final page count as needed...
*/
- if (snmp_fd >= 0 &&
+ if (have_supplies &&
!backendSNMPSupplies(snmp_fd, &(addr->addr), &page_count, NULL) &&
page_count > start_count)
fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
if ((bytes = read(device_fd, buffer, sizeof(buffer))) > 0)
{
- fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+ fprintf(stderr, "DEBUG: Received %d bytes of back-channel data\n",
(int)bytes);
cupsBackChannelWrite(buffer, bytes, 1.0);
}
projects / thirdparty / cups.git / blobdiff