---------------------
PatchSet 1955 
Date: 2005/10/17 23:11:42
Author: rousskov
Branch: squid3-icap
Tag: (none) 
Log:
- Use ICAP::* types and constants from ICAPElements instead of
  ICAPServiceRep::* and globals.

- ICAPXaction is now ICAPModXact.

Members: 
	src/ICAPClient.cc:1.1.2.8->1.1.2.9 
	src/ICAPClient.h:1.1.2.7->1.1.2.8 

Index: squid3/src/ICAPClient.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPClient.cc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- squid3/src/ICAPClient.cc	29 Sep 2005 18:00:44 -0000	1.1.2.8
+++ squid3/src/ICAPClient.cc	17 Oct 2005 23:11:42 -0000	1.1.2.9
@@ -1,5 +1,5 @@
 #include "squid.h"
-#include "ICAPXaction.h"
+#include "ICAPModXact.h"
 #include "ICAPClient.h"
 #include "http.h"
 
@@ -11,7 +11,7 @@
      * data from the network that won't fit into the MsgPipe,
      * which leads to a runtime assertion.
      */
-    assert(ICAPMsgPipeBufSizeMax >= SQUID_TCP_SO_RCVBUF);
+    assert(ICAP::MsgPipeBufSizeMax >= SQUID_TCP_SO_RCVBUF);
 }
 
 void ICAPCleanModule()
@@ -20,15 +20,15 @@
 // initialize ICAP-specific ends of message pipes
 void ICAPInitXaction(ICAPServiceRep::Pointer service, MsgPipe::Pointer virgin, MsgPipe::Pointer adapted)
 {
-    ICAPXaction::Pointer x = new ICAPXaction;
+    ICAPModXact::Pointer x = new ICAPModXact;
     debugs(93,5, "ICAPInitXaction: " << x.getRaw());
     x->init(service, virgin, adapted, x);
     // if we want to do something to the transaction after it is done,
     // we need to keep a pointer to it
 }
 
-// declared in ICAPXaction.h (ick?)
-void ICAPNoteXactionDone(ICAPXaction::Pointer x)
+// declared in ICAPModXact.h (ick?)
+void ICAPNoteXactionDone(ICAPModXact::Pointer x)
 {
     // nothing to be done here?
     // refcounting will delete the transaction
Index: squid3/src/ICAPClient.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPClient.h,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- squid3/src/ICAPClient.h	29 Sep 2005 18:00:44 -0000	1.1.2.7
+++ squid3/src/ICAPClient.h	17 Oct 2005 23:11:42 -0000	1.1.2.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPClient.h,v 1.1.2.7 2005/09/29 18:00:44 dwsquid Exp $
+ * $Id: ICAPClient.h,v 1.1.2.8 2005/10/17 23:11:42 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -34,10 +34,10 @@
 #ifndef SQUID_ICAPCLIENT_H
 #define SQUID_ICAPCLIENT_H
 
+#include "MsgPipe.h"        // TODO: move; needed for ICAPInitXaction()
+#include "ICAPServiceRep.h" // TODO: move; needed for ICAPInitXaction()
 
-// These are public ICAP interfaces for use by Squid code unaware of
-// ICAP internals and treating ICAP as an opaque message adaptation
-// protocol.
+// ICAP-related things needed by code unaware of ICAP internals.
 
 extern void ICAPInitModule();
 extern void ICAPCleanModule();
@@ -47,7 +47,4 @@
 class MsgPipe;
 extern void ICAPInitXaction(ICAPServiceRep::Pointer, MsgPipe::Pointer virgin, MsgPipe::Pointer adapted);
 
-// recommended initial size and max capacity for MsgPipe buffer
-enum { ICAPMsgPipeBufSizeMin = (4*1024), ICAPMsgPipeBufSizeMax = SQUID_TCP_SO_RCVBUF };
-
 #endif /* SQUID_ICAPCLIENT_H */