SourceFormat Enforcement

[thirdparty/squid.git] / src / AccessLogEntry.h

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index d3f3f0fe2c6ba7fd71d97dbcbd2ff0fe8878a889..e5cf61285754d39126e52023ef92a0926b9a6acf 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -41,6 +41,9 @@
 #include "adaptation/icap/Elements.h"
 #endif
 #include "RefCount.h"
+#if USE_SSL
+#include "ssl/gadgets.h"
+#endif
 
 /* forward decls */
 class HttpReply;
@@ -115,6 +118,18 @@ public:
         const char *opcode;
     } htcp;
 
+#if USE_SSL
+    /// logging information specific to the SSL protocol
+    class SslDetails
+    {
+    public:
+        SslDetails();
+
+        const char *user; ///< emailAddress from the SSL client certificate
+        int bumpMode; ///< whether and how the request was SslBumped
+    } ssl;
+#endif
+
     /** \brief This subclass holds log info for Squid internal stats
      * \todo Inner class declarations should be moved outside
      * \todo some details relevant to particular protocols need shuffling to other sub-classes
@@ -139,8 +154,8 @@ public:
 #if USE_SSL
                 ssluser(NULL),
 #endif
-                port(NULL)
-        {;
+                port(NULL) {
+            ;
         }
 
         Ip::Address caddr;
@@ -158,6 +173,7 @@ public:
 #if USE_SSL
 
         const char *ssluser;
+        Ssl::X509_Pointer sslClientCert; ///< cert received from the client
 #endif
         AnyP::PortCfg *port;
 
@@ -212,7 +228,6 @@ public:
     HttpRequest *request; //< virgin HTTP request
     HttpRequest *adapted_request; //< HTTP request after adaptation and redirection
 
-
 #if ICAP_CLIENT
     /** \brief This subclass holds log info for ICAP part of request
      *  \todo Inner class declarations should be moved outside