/*
* "$Id: request.c 7946 2008-09-16 23:27:54Z mike $"
*
- * IPP utilities for the Common UNIX Printing System (CUPS).
+ * IPP utilities for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2011 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* cupsDoIORequest() - Do an IPP request with file descriptors.
* cupsDoRequest() - Do an IPP request.
* cupsGetResponse() - Get a response to an IPP request.
+ * cupsLastError() - Return the last IPP status code.
+ * cupsLastErrorString() - Return the last IPP status-message.
+ * _cupsNextDelay() - Return the next retry delay value.
* cupsReadResponseData() - Read additional data after the IPP response.
* cupsSendRequest() - Send an IPP request.
* cupsWriteRequestData() - Write additional data after an IPP request.
+ * _cupsConnect() - Get the default server connection...
* _cupsSetError() - Set the last IPP status code and status-message.
* _cupsSetHTTPError() - Set the last error using the HTTP status.
*/
* Include necessary headers...
*/
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <errno.h>
+#include "cups-private.h"
#include <fcntl.h>
#include <sys/stat.h>
#if defined(WIN32) || defined(__EMX__)
if (!http)
if ((http = _cupsConnect()) == NULL)
+ {
+ ippDelete(request);
+
return (NULL);
+ }
/*
* See if we have a file to send...
{
if (httpCheck(http))
{
- if ((status = httpUpdate(http)) != HTTP_CONTINUE)
+ _httpUpdate(http, &status);
+
+ if (status >= HTTP_MULTIPLE_CHOICES)
break;
}
response = cupsGetResponse(http, resource);
status = http->status;
}
+ else
+ httpFlush(http);
DEBUG_printf(("2cupsDoIORequest: status=%d", status));
- if (status >= HTTP_BAD_REQUEST &&
- status != HTTP_UNAUTHORIZED &&
- status != HTTP_UPGRADE_REQUIRED)
+ if (status == HTTP_ERROR ||
+ (status >= HTTP_BAD_REQUEST && status != HTTP_UNAUTHORIZED &&
+ status != HTTP_UPGRADE_REQUIRED))
{
- httpFlush(http);
_cupsSetHTTPError(status);
break;
}
- if (response)
+ if (response && outfile >= 0)
{
- if (outfile >= 0)
- {
- /*
- * Write trailing data to file...
- */
+ /*
+ * Write trailing data to file...
+ */
- while ((bytes = (int)httpRead2(http, buffer, sizeof(buffer))) > 0)
- if (write(outfile, buffer, bytes) < bytes)
- break;
- }
- else
- {
- /*
- * Flush any remaining data...
- */
+ while ((bytes = (int)httpRead2(http, buffer, sizeof(buffer))) > 0)
+ if (write(outfile, buffer, bytes) < bytes)
+ break;
+ }
- httpFlush(http);
- }
+ if (http->state != HTTP_WAITING)
+ {
+ /*
+ * Flush any remaining data...
+ */
+
+ httpFlush(http);
}
}
/*
* Delete the original request and return the response...
*/
-
+
ippDelete(request);
return (response);
*
* Use this function to get the response for an IPP request sent using
* cupsSendDocument() or cupsSendRequest(). For requests that return
- * additional data, use httpRead() after getting a successful response.
+ * additional data, use httpRead() after getting a successful response,
+ * otherwise call httpFlush() to complete the response processing.
*
* @since CUPS 1.4/Mac OS X 10.6@
*/
DEBUG_printf(("2cupsGetResponse: Update loop, http->status=%d...",
http->status));
- status = http->status;
- while (status == HTTP_CONTINUE)
+ do
+ {
status = httpUpdate(http);
+ }
+ while (status != HTTP_ERROR && http->state == HTTP_POST_RECV);
DEBUG_printf(("2cupsGetResponse: status=%d", status));
if (state == IPP_ERROR)
{
/*
- * Delete the response...
+ * Flush remaining data and delete the response...
*/
DEBUG_puts("1cupsGetResponse: IPP read error!");
+ httpFlush(http);
+
ippDelete(response);
response = NULL;
_cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+ http->status = status = HTTP_ERROR;
+ http->error = EIO;
}
}
else if (status != HTTP_ERROR)
DEBUG_puts("2cupsGetResponse: Need authorization...");
if (!cupsDoAuthentication(http, "POST", resource))
- httpReconnect(http);
+ httpReconnect(http);
else
- status = HTTP_AUTHORIZATION_CANCELED;
+ http->status = status = HTTP_AUTHORIZATION_CANCELED;
}
#ifdef HAVE_SSL
}
+/*
+ * 'cupsLastError()' - Return the last IPP status code.
+ */
+
+ipp_status_t /* O - IPP status code from last request */
+cupsLastError(void)
+{
+ return (_cupsGlobals()->last_error);
+}
+
+
+/*
+ * 'cupsLastErrorString()' - Return the last IPP status-message.
+ *
+ * @since CUPS 1.2/Mac OS X 10.5@
+ */
+
+const char * /* O - status-message text from last request */
+cupsLastErrorString(void)
+{
+ return (_cupsGlobals()->last_status_message);
+}
+
+
+/*
+ * '_cupsNextDelay()' - Return the next retry delay value.
+ *
+ * This function currently returns the Fibonacci sequence 1 1 2 3 5 8.
+ *
+ * Pass 0 for the current delay value to initialize the sequence.
+ */
+
+int /* O - Next delay value */
+_cupsNextDelay(int current, /* I - Current delay value or 0 */
+ int *previous) /* IO - Previous delay value */
+{
+ int next; /* Next delay value */
+
+
+ if (current > 0)
+ {
+ next = (current + *previous) % 12;
+ *previous = next < current ? 0 : current;
+ }
+ else
+ {
+ next = 1;
+ *previous = 0;
+ }
+
+ return (next);
+}
+
+
/*
* 'cupsReadResponseData()' - Read additional data after the IPP response.
*
*
* Use httpWrite() to write any additional data (document, PPD file, etc.)
* for the request, cupsGetResponse() to get the IPP response, and httpRead()
- * to read any additional data following the response. Only one request can be
+ * to read any additional data following the response. Only one request can be
* sent/queued at a time.
*
* Unlike cupsDoFileRequest(), cupsDoIORequest(), and cupsDoRequest(), the
if ((http = _cupsConnect()) == NULL)
return (HTTP_SERVICE_UNAVAILABLE);
+ /*
+ * If the prior request was not flushed out, do so now...
+ */
+
+ if (http->state == HTTP_GET_SEND ||
+ http->state == HTTP_POST_SEND)
+ httpFlush(http);
+ else if (http->state != HTTP_WAITING)
+ {
+ _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
+
+ return (HTTP_ERROR);
+ }
+
#ifdef HAVE_SSL
/*
* See if we have an auth-info attribute and are communicating over
* Reconnect if the last response had a "Connection: close"...
*/
- if (!strcasecmp(http->fields[HTTP_FIELD_CONNECTION], "close"))
+ if (!_cups_strcasecmp(http->fields[HTTP_FIELD_CONNECTION], "close"))
if (httpReconnect(http))
{
_cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
*/
httpClearFields(http);
- httpSetLength(http, length);
+ httpSetExpect(http, expect);
httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
+ httpSetLength(http, length);
+
+#ifdef HAVE_GSSAPI
+ if (http->authstring && !strncmp(http->authstring, "Negotiate", 9))
+ {
+ /*
+ * Do not use cached Kerberos credentials since they will look like a
+ * "replay" attack...
+ */
+
+ _cupsSetNegotiateAuthString(http, "POST", resource);
+ }
+#endif /* HAVE_GSSAPI */
+
httpSetField(http, HTTP_FIELD_AUTHORIZATION, http->authstring);
- httpSetExpect(http, expect);
DEBUG_printf(("2cupsSendRequest: authstring=\"%s\"", http->authstring));
{
got_status = 1;
- if ((status = httpUpdate(http)) != HTTP_CONTINUE)
+ _httpUpdate(http, &status);
+ if (status >= HTTP_MULTIPLE_CHOICES)
break;
}
+ if (state == IPP_ERROR)
+ {
+ http->status = HTTP_ERROR;
+ http->state = HTTP_WAITING;
+
+ return (HTTP_ERROR);
+ }
+
/*
* Wait up to 1 second to get the 100-continue response as needed...
*/
- if (!got_status && expect == HTTP_CONTINUE)
+ if (!got_status)
{
- DEBUG_puts("2cupsSendRequest: Waiting for 100-continue...");
+ if (expect == HTTP_CONTINUE)
+ {
+ DEBUG_puts("2cupsSendRequest: Waiting for 100-continue...");
- if (httpWait(http, 1000))
- status = httpUpdate(http);
+ if (httpWait(http, 1000))
+ _httpUpdate(http, &status);
+ }
+ else if (httpCheck(http))
+ _httpUpdate(http, &status);
}
- else if (httpCheck(http))
- status = httpUpdate(http);
DEBUG_printf(("2cupsSendRequest: status=%d", status));
* Process the current HTTP status...
*/
+ if (status >= HTTP_MULTIPLE_CHOICES)
+ httpFlush(http);
+
switch (status)
{
case HTTP_ERROR :
return (status);
case HTTP_UNAUTHORIZED :
- if (!cupsDoAuthentication(http, "POST", resource))
+ if (cupsDoAuthentication(http, "POST", resource))
+ return (HTTP_AUTHORIZATION_CANCELED);
+
+ if (httpReconnect(http))
{
- if (httpReconnect(http))
- {
- _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
- return (HTTP_SERVICE_UNAVAILABLE);
- }
+ _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+ return (HTTP_SERVICE_UNAVAILABLE);
}
- else
- status = HTTP_AUTHORIZATION_CANCELED;
-
- return (status);
+ break;
#ifdef HAVE_SSL
case HTTP_UPGRADE_REQUIRED :
return (HTTP_SERVICE_UNAVAILABLE);
}
- httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
-
- return (status);
+ if (httpEncryption(http, HTTP_ENCRYPT_REQUIRED))
+ {
+ _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+ return (HTTP_SERVICE_UNAVAILABLE);
+ }
+ break;
#endif /* HAVE_SSL */
case HTTP_EXPECTATION_FAILED :
if ((http = cg->http) == NULL)
{
_cupsSetError(IPP_INTERNAL_ERROR, _("No active connection"), 1);
+ DEBUG_puts("1cupsWriteRequestData: Returning HTTP_ERROR.");
return (HTTP_ERROR);
}
}
wused = http->wused;
if (httpWrite2(http, buffer, length) < 0)
+ {
+ DEBUG_puts("1cupsWriteRequestData: Returning HTTP_ERROR.");
+ _cupsSetError(IPP_INTERNAL_ERROR, strerror(http->error), 0);
return (HTTP_ERROR);
+ }
/*
* Finally, check if we have any pending data from the server...
*/
if (_httpWait(http, 0, 1))
- return (httpUpdate(http));
+ {
+ http_status_t status; /* Status from _httpUpdate */
+
+ _httpUpdate(http, &status);
+ if (status >= HTTP_MULTIPLE_CHOICES)
+ {
+ _cupsSetHTTPError(status);
+ httpFlush(http);
+ }
+
+ DEBUG_printf(("1cupsWriteRequestData: Returning %d.\n", status));
+ return (status);
+ }
}
+ DEBUG_puts("1cupsWriteRequestData: Returning HTTP_CONTINUE.");
return (HTTP_CONTINUE);
}
+/*
+ * '_cupsConnect()' - Get the default server connection...
+ */
+
+http_t * /* O - HTTP connection */
+_cupsConnect(void)
+{
+ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
+
+
+ /*
+ * See if we are connected to the same server...
+ */
+
+ if (cg->http)
+ {
+ /*
+ * Compare the connection hostname, port, and encryption settings to
+ * the cached defaults; these were initialized the first time we
+ * connected...
+ */
+
+ if (strcmp(cg->http->hostname, cg->server) ||
+ cg->ipp_port != _httpAddrPort(cg->http->hostaddr) ||
+ (cg->http->encryption != cg->encryption &&
+ cg->http->encryption == HTTP_ENCRYPT_NEVER))
+ {
+ /*
+ * Need to close the current connection because something has changed...
+ */
+
+ httpClose(cg->http);
+ cg->http = NULL;
+ }
+ }
+
+ /*
+ * (Re)connect as needed...
+ */
+
+ if (!cg->http)
+ {
+ if ((cg->http = httpConnectEncrypt(cupsServer(), ippPort(),
+ cupsEncryption())) == NULL)
+ {
+ if (errno)
+ _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+ else
+ _cupsSetError(IPP_SERVICE_UNAVAILABLE,
+ _("Unable to connect to host."), 1);
+ }
+ }
+
+ /*
+ * Return the cached connection...
+ */
+
+ return (cg->http);
+}
+
+
/*
* '_cupsSetError()' - Set the last IPP status code and status-message.
*/
break;
case HTTP_UNAUTHORIZED :
+ _cupsSetError(IPP_NOT_AUTHENTICATED, httpStatus(status), 0);
+ break;
+
case HTTP_AUTHORIZATION_CANCELED :
- _cupsSetError(IPP_NOT_AUTHORIZED, httpStatus(status), 0);
+ _cupsSetError(IPP_AUTHENTICATION_CANCELED, httpStatus(status), 0);
break;
case HTTP_FORBIDDEN :
_cupsSetError(IPP_VERSION_NOT_SUPPORTED, httpStatus(status), 0);
break;
+ case HTTP_UPGRADE_REQUIRED :
+ _cupsSetError(IPP_UPGRADE_REQUIRED, httpStatus(status), 0);
+ break;
+
+ case HTTP_PKI_ERROR :
+ _cupsSetError(IPP_PKI_ERROR, httpStatus(status), 0);
+ break;
+
+ case HTTP_ERROR :
+ _cupsSetError(IPP_INTERNAL_ERROR, httpStatus(status), 0);
+ break;
+
default :
DEBUG_printf(("4_cupsSetHTTPError: HTTP error %d mapped to "
"IPP_SERVICE_UNAVAILABLE!", status));
projects / thirdparty / cups.git / blobdiff