SourceFormat Enforcement

[thirdparty/squid.git] / src / auth / digest / UserRequest.h

diff --git a/src/auth/digest/UserRequest.h b/src/auth/digest/UserRequest.h
index 88bf96a3ccfb6597b9630ee2501f39a32db5a8fc..89cf090c816f4e3aba8f21745997030b97ec535d 100644 (file)
--- a/src/auth/digest/UserRequest.h
+++ b/src/auth/digest/UserRequest.h
@@ -1,35 +1,46 @@
+/*
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #ifndef _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H
 #define _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H
 
 #include "auth/UserRequest.h"
-#include "auth/digest/auth_digest.h"
-#include "MemPool.h"
 
 class ConnStateData;
 class HttpReply;
 class HttpRequest;
 
+namespace Auth
+{
+namespace Digest
+{
+
 /**
- * The AuthDigestUserRequest structure is what follows the http_request around
+ * The UserRequest structure is what follows the http_request around
  */
-class AuthDigestUserRequest : public AuthUserRequest
+class UserRequest : public Auth::UserRequest
 {
+    MEMPROXY_CLASS(Auth::Digest::UserRequest);
 
 public:
-    MEMPROXY_CLASS(AuthDigestUserRequest);
-
-    AuthDigestUserRequest();
-    virtual ~AuthDigestUserRequest();
+    UserRequest();
+    virtual ~UserRequest();
 
     virtual int authenticated() const;
     virtual void authenticate(HttpRequest * request, ConnStateData * conn, http_hdr_type type);
-    virtual Auth::Direction module_direction();
+    virtual Direction module_direction();
     virtual void addAuthenticationInfoHeader(HttpReply * rep, int accel);
 #if WAITING_FOR_TE
     virtual void addAuthenticationInfoTrailer(HttpReply * rep, int accel);
 #endif
 
-    virtual void module_start(RH *, void *);
+    virtual void startHelperLookup(HttpRequest *request, AccessLogEntry::Pointer &al, AUTHCB *, void *);
+    virtual const char *credentialsStr();
 
     char *nonceb64;             /* "dcd98b7102dd2f0e8b11d0f600bfb0c093" */
     char *cnonce;               /* "0a4f113b" */
@@ -43,9 +54,9 @@ public:
     char *response;
 
     struct {
-        unsigned int authinfo_sent:1;
-        unsigned int invalid_password:1;
-        unsigned int helper_queried:1;
+        bool authinfo_sent;
+        bool invalid_password;
+        bool helper_queried;
     } flags;
     digest_nonce_h *nonce;
 
@@ -53,6 +64,8 @@ private:
     static HLPCB HandleReply;
 };
 
-MEMPROXY_CLASS_INLINE(AuthDigestUserRequest);
+} // namespace Digest
+} // namespace Auth
 
 #endif /* _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H */
+