DW:

 - log SSL status codes in access.log.  Since ssl.c doesn't know about
   HttpReply or MemObject, the least ugly way to do this seems to be
   passing a pointer to the HTTP status variable.

diff --git a/src/client_side.cc b/src/client_side.cc
index ae2e735466d00279e45f426a5f6e72542f1e351a..7794d081753c7e71c0e5e55af3286155a526dff4 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.500 2000/10/04 01:46:30 wessels Exp $
+ * $Id: client_side.cc,v 1.501 2000/10/04 02:18:48 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2071,7 +2071,7 @@ clientProcessRequest(clientHttpRequest * http)
        url);
     if (r->method == METHOD_CONNECT) {
        http->log_type = LOG_TCP_MISS;
-       sslStart(fd, url, r, &http->out.size);
+       sslStart(fd, url, r, &http->out.size, &http->al.http.code);
        return;
     } else if (r->method == METHOD_PURGE) {
        clientPurgeRequest(http);

diff --git a/src/protos.h b/src/protos.h
index 4639ffcb01505e48f64487a5596634ba996010ac..d40b508d912bbfe909b5d86e0c24fb99d0cded5a 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.378 2000/10/04 00:24:17 wessels Exp $
+ * $Id: protos.h,v 1.379 2000/10/04 02:18:49 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -708,7 +708,7 @@ extern void shut_down(int);
 
 
 extern void start_announce(void *unused);
-extern void sslStart(int fd, const char *, request_t *, size_t * sz);
+extern void sslStart(int fd, const char *, request_t *, size_t *, int *);
 extern void waisStart(FwdState *);
 
 /* ident.c */

diff --git a/src/ssl.cc b/src/ssl.cc
index b67d853ae719a5fbfcd40f0346f3135744e81e27..783bd5f86d9b064571763b89fb89606f7ae35672 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.107 2000/06/27 22:06:04 hno Exp $
+ * $Id: ssl.cc,v 1.108 2000/10/04 02:18:49 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -47,6 +47,7 @@ typedef struct {
        char *buf;
     } client, server;
     size_t *size_ptr;          /* pointer to size in an ConnStateData for logging */
+    int *status_ptr;           /* pointer to status for logging */
 #if DELAY_POOLS
     delay_id delay_id;
 #endif
@@ -361,6 +362,7 @@ sslConnected(int fd, void *data)
 {
     SslStateData *sslState = data;
     debug(26, 3) ("sslConnected: FD %d sslState=%p\n", fd, sslState);
+    *sslState->status_ptr = HTTP_OK;
     xstrncpy(sslState->server.buf, conn_established, SQUID_TCP_SO_RCVBUF);
     sslState->server.len = strlen(conn_established);
     sslSetSelect(sslState);
@@ -396,6 +398,7 @@ sslConnectDone(int fdnotused, int status, void *data)
     if (status == COMM_ERR_DNS) {
        debug(26, 4) ("sslConnect: Unknown host: %s\n", sslState->host);
        err = errorCon(ERR_DNS_FAIL, HTTP_NOT_FOUND);
+       *sslState->status_ptr = HTTP_NOT_FOUND;
        err->request = requestLink(request);
        err->dnsserver_msg = xstrdup(dns_error_message);
        err->callback = sslErrorComplete;
@@ -403,6 +406,7 @@ sslConnectDone(int fdnotused, int status, void *data)
        errorSend(sslState->client.fd, err);
     } else if (status != COMM_OK) {
        err = errorCon(ERR_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE);
+       *sslState->status_ptr = HTTP_SERVICE_UNAVAILABLE;
        err->xerrno = errno;
        err->host = xstrdup(sslState->host);
        err->port = sslState->port;
@@ -426,7 +430,7 @@ sslConnectDone(int fdnotused, int status, void *data)
 }
 
 void
-sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
+sslStart(int fd, const char *url, request_t * request, size_t * size_ptr, int *status_ptr)
 {
     /* Create state structure. */
     SslStateData *sslState = NULL;
@@ -451,6 +455,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
        answer = aclCheckFast(Config.accessList.miss, &ch);
        if (answer == 0) {
            err = errorCon(ERR_FORWARDING_DENIED, HTTP_FORBIDDEN);
+           *sslState->status_ptr = HTTP_FORBIDDEN;
            err->request = requestLink(request);
            err->src_addr = request->client_addr;
            errorSend(fd, err);
@@ -471,6 +476,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
     if (sock == COMM_ERROR) {
        debug(26, 4) ("sslStart: Failed because we're out of sockets.\n");
        err = errorCon(ERR_SOCKET_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
+       *sslState->status_ptr = HTTP_INTERNAL_SERVER_ERROR;
        err->xerrno = errno;
        err->request = requestLink(request);
        errorSend(fd, err);
@@ -485,6 +491,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
     sslState->url = xstrdup(url);
     sslState->request = requestLink(request);
     sslState->size_ptr = size_ptr;
+    sslState->status_ptr = status_ptr;
     sslState->client.fd = fd;
     sslState->server.fd = sock;
     sslState->server.buf = xmalloc(SQUID_TCP_SO_RCVBUF);
@@ -557,6 +564,7 @@ sslPeerSelectComplete(FwdServer * fs, void *data)
     if (fs == NULL) {
        ErrorState *err;
        err = errorCon(ERR_CANNOT_FORWARD, HTTP_SERVICE_UNAVAILABLE);
+       *sslState->status_ptr = HTTP_SERVICE_UNAVAILABLE;
        err->request = requestLink(sslState->request);
        err->callback = sslErrorComplete;
        err->callback_data = sslState;

diff --git a/src/tunnel.cc b/src/tunnel.cc
index c628988dde2c47058ecdb0119de23c40d57f14fe..5228c1d97c66a7e4949ba9467004654b32a6b718 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.107 2000/06/27 22:06:04 hno Exp $
+ * $Id: tunnel.cc,v 1.108 2000/10/04 02:18:49 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -47,6 +47,7 @@ typedef struct {
        char *buf;
     } client, server;
     size_t *size_ptr;          /* pointer to size in an ConnStateData for logging */
+    int *status_ptr;           /* pointer to status for logging */
 #if DELAY_POOLS
     delay_id delay_id;
 #endif
@@ -361,6 +362,7 @@ sslConnected(int fd, void *data)
 {
     SslStateData *sslState = data;
     debug(26, 3) ("sslConnected: FD %d sslState=%p\n", fd, sslState);
+    *sslState->status_ptr = HTTP_OK;
     xstrncpy(sslState->server.buf, conn_established, SQUID_TCP_SO_RCVBUF);
     sslState->server.len = strlen(conn_established);
     sslSetSelect(sslState);
@@ -396,6 +398,7 @@ sslConnectDone(int fdnotused, int status, void *data)
     if (status == COMM_ERR_DNS) {
        debug(26, 4) ("sslConnect: Unknown host: %s\n", sslState->host);
        err = errorCon(ERR_DNS_FAIL, HTTP_NOT_FOUND);
+       *sslState->status_ptr = HTTP_NOT_FOUND;
        err->request = requestLink(request);
        err->dnsserver_msg = xstrdup(dns_error_message);
        err->callback = sslErrorComplete;
@@ -403,6 +406,7 @@ sslConnectDone(int fdnotused, int status, void *data)
        errorSend(sslState->client.fd, err);
     } else if (status != COMM_OK) {
        err = errorCon(ERR_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE);
+       *sslState->status_ptr = HTTP_SERVICE_UNAVAILABLE;
        err->xerrno = errno;
        err->host = xstrdup(sslState->host);
        err->port = sslState->port;
@@ -426,7 +430,7 @@ sslConnectDone(int fdnotused, int status, void *data)
 }
 
 void
-sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
+sslStart(int fd, const char *url, request_t * request, size_t * size_ptr, int *status_ptr)
 {
     /* Create state structure. */
     SslStateData *sslState = NULL;
@@ -451,6 +455,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
        answer = aclCheckFast(Config.accessList.miss, &ch);
        if (answer == 0) {
            err = errorCon(ERR_FORWARDING_DENIED, HTTP_FORBIDDEN);
+           *sslState->status_ptr = HTTP_FORBIDDEN;
            err->request = requestLink(request);
            err->src_addr = request->client_addr;
            errorSend(fd, err);
@@ -471,6 +476,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
     if (sock == COMM_ERROR) {
        debug(26, 4) ("sslStart: Failed because we're out of sockets.\n");
        err = errorCon(ERR_SOCKET_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
+       *sslState->status_ptr = HTTP_INTERNAL_SERVER_ERROR;
        err->xerrno = errno;
        err->request = requestLink(request);
        errorSend(fd, err);
@@ -485,6 +491,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr)
     sslState->url = xstrdup(url);
     sslState->request = requestLink(request);
     sslState->size_ptr = size_ptr;
+    sslState->status_ptr = status_ptr;
     sslState->client.fd = fd;
     sslState->server.fd = sock;
     sslState->server.buf = xmalloc(SQUID_TCP_SO_RCVBUF);
@@ -557,6 +564,7 @@ sslPeerSelectComplete(FwdServer * fs, void *data)
     if (fs == NULL) {
        ErrorState *err;
        err = errorCon(ERR_CANNOT_FORWARD, HTTP_SERVICE_UNAVAILABLE);
+       *sslState->status_ptr = HTTP_SERVICE_UNAVAILABLE;
        err->request = requestLink(sslState->request);
        err->callback = sslErrorComplete;
        err->callback_data = sslState;