Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / icp_v3.cc

diff --git a/src/icp_v3.cc b/src/icp_v3.cc
index 8b8c5874b7efa5cc736b05b6159148d82fdf1132..2caa62e41bd12c5777068b6d8f08e9ebb70d1c62 100644 (file)
--- a/src/icp_v3.cc
+++ b/src/icp_v3.cc
@@ -1,8 +1,7 @@
-
 /*
- * $Id: icp_v3.cc,v 1.42 2007/04/28 22:26:37 hno Exp $
+ * $Id$
  *
- * DEBUG: section 12    Internet Cache Protocol
+ * DEBUG: section 12    Internet Cache Protocol (ICP)
  * AUTHOR: Duane Wessels
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -21,49 +20,53 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
 
-#include "squid.h"
+/**
+ \defgroup ServerProtocolICPInternal3 ICPv3 Internals
+ \ingroup ServerProtocolICPAPI
+ */
+
+#include "squid-old.h"
 #include "Store.h"
 #include "ICP.h"
 #include "HttpRequest.h"
 
+/// \ingroup ServerProtocolICPInternal3
 class ICP3State : public ICPState, public StoreClient
 {
 
 public:
-    ICP3State(icp_common_t &aHeader, HttpRequest *aRequest):
-       ICPState(aHeader, aRequest)
-       {}
+    ICP3State(icp_common_t &aHeader, HttpRequest *aRequest) :
+            ICPState(aHeader, aRequest) {}
 
     ~ICP3State();
     void created (StoreEntry *newEntry);
 };
 
+/// \ingroup ServerProtocolICPInternal3
 static void
-
-doV3Query(int fd, struct sockaddr_in from, char *buf, icp_common_t header)
+doV3Query(int fd, Ip::Address &from, char *buf, icp_common_t header)
 {
     /* We have a valid packet */
-    char *url = buf + sizeof(icp_common_t) + sizeof(u_int32_t);
-    HttpRequest *icp_request = icpGetRequest (url, header.reqnum, fd, &from);
+    char *url = buf + sizeof(icp_common_t) + sizeof(uint32_t);
+    HttpRequest *icp_request = icpGetRequest (url, header.reqnum, fd, from);
 
     if (!icp_request)
         return;
 
-    if (!icpAccessAllowed(&from, icp_request))
-    {
-        icpDenyAccess (&from, url, header.reqnum, fd);
+    if (!icpAccessAllowed(from, icp_request)) {
+        icpDenyAccess (from, url, header.reqnum, fd);
         delete icp_request;
         return;
     }
@@ -80,11 +83,11 @@ doV3Query(int fd, struct sockaddr_in from, char *buf, icp_common_t header)
     StoreEntry::getPublic (state, url, METHOD_GET);
 }
 
-ICP3State::~ICP3State ()
+ICP3State::~ICP3State()
 {}
 
 void
-ICP3State::created (StoreEntry *newEntry)
+ICP3State::created(StoreEntry *newEntry)
 {
     StoreEntry *entry = newEntry->isNull () ? NULL : newEntry;
     debugs(12, 5, "icpHandleIcpV3: OPCODE " << icp_opcode_str[header.opcode]);
@@ -97,18 +100,18 @@ ICP3State::created (StoreEntry *newEntry)
     else
         codeToSend = icpGetCommonOpcode();
 
-    icpCreateAndSend (codeToSend, 0, url, header.reqnum, 0, fd, &from);
+    icpCreateAndSend (codeToSend, 0, url, header.reqnum, 0, fd, from);
 
     delete this;
 }
 
+
+/// \ingroup ServerProtocolICPInternal3
 /* Currently Harvest cached-2.x uses ICP_VERSION_3 */
 void
-
-icpHandleIcpV3(int fd, struct sockaddr_in from, char *buf, int len)
+icpHandleIcpV3(int fd, Ip::Address &from, char *buf, int len)
 {
-    if (len <= 0)
-    {
+    if (len <= 0) {
         debugs(12, 3, "icpHandleIcpV3: ICP message is too small");
         return;
     }
@@ -118,24 +121,18 @@ icpHandleIcpV3(int fd, struct sockaddr_in from, char *buf, int len)
      * Length field should match the number of bytes read
      */
 
-    if (len != header.length)
-    {
+    if (len != header.length) {
         debugs(12, 3, "icpHandleIcpV3: ICP message is too small");
         return;
     }
 
-    switch (header.opcode)
-    {
+    switch (header.opcode) {
 
     case ICP_QUERY:
-        doV3Query(fd, from,buf, header);
+        doV3Query(fd, from, buf, header);
         break;
 
     case ICP_HIT:
-#if ALLOW_SOURCE_PING
-
-    case ICP_SECHO:
-#endif
 
     case ICP_DECHO:
 
@@ -144,7 +141,7 @@ icpHandleIcpV3(int fd, struct sockaddr_in from, char *buf, int len)
     case ICP_DENIED:
 
     case ICP_MISS_NOFETCH:
-        header.handleReply(buf, &from);
+        header.handleReply(buf, from);
         break;
 
     case ICP_INVALID:
@@ -153,7 +150,7 @@ icpHandleIcpV3(int fd, struct sockaddr_in from, char *buf, int len)
         break;
 
     default:
-        debugs(12, 0, "icpHandleIcpV3: UNKNOWN OPCODE: " << header.opcode << " from " << inet_ntoa(from.sin_addr));
+        debugs(12, 0, "icpHandleIcpV3: UNKNOWN OPCODE: " << header.opcode << " from " << from);
         break;
     }
 }