---------------------
PatchSet 5216 
Date: 2002/10/04 12:43:21
Author: adri
Branch: commloops
Tag: (none) 
Log:

Since there's no real neat place to put this, stuff the
comm_fill() and related magic in comm.h.
People should include StoreIOBuffer.h before comm.h.

Members: 
	src/comm.c:1.21.4.15->1.21.4.16 
	src/comm.h:1.1->1.1.2.1 
	src/protos.h:1.49.4.11->1.49.4.12 
	src/structs.h:1.51.4.2->1.51.4.3 

Index: squid/src/comm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm.c,v
retrieving revision 1.21.4.15
retrieving revision 1.21.4.16
diff -u -r1.21.4.15 -r1.21.4.16
--- squid/src/comm.c	4 Oct 2002 09:47:42 -0000	1.21.4.15
+++ squid/src/comm.c	4 Oct 2002 12:43:21 -0000	1.21.4.16
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.c,v 1.21.4.15 2002/10/04 09:47:42 adri Exp $
+ * $Id: comm.c,v 1.21.4.16 2002/10/04 12:43:21 adri Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "StoreIOBuffer.h"
+#include "comm.h"
 
 #if defined(_SQUID_CYGWIN_)
 #include <sys/ioctl.h>
@@ -75,7 +76,6 @@
 static int commRetryConnect(ConnectStateData * cs);
 CBDATA_TYPE(ConnectStateData);
 
-typedef void IOFCB(int fd, StoreIOBuffer sb, size_t readlen, comm_err_t flag, int xerrno, void *data);
 
 struct _fdc_t {
 	int active;
--- /dev/null	Wed Feb 14 01:05:20 2007
+++ squid/src/comm.h	Wed Feb 14 01:07:18 2007
@@ -0,0 +1,10 @@
+#ifndef __COMM_H__
+#define __COMM_H__
+
+
+typedef void IOFCB(int fd, StoreIOBuffer sb, size_t readlen, comm_err_t flag, int xerrno, void *data);
+extern void comm_fill(int fd, StoreIOBuffer sb, IOFCB *callback, void *data);
+
+
+
+#endif
Index: squid/src/protos.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/protos.h,v
retrieving revision 1.49.4.11
retrieving revision 1.49.4.12
diff -u -r1.49.4.11 -r1.49.4.12
--- squid/src/protos.h	4 Oct 2002 09:47:41 -0000	1.49.4.11
+++ squid/src/protos.h	4 Oct 2002 12:43:22 -0000	1.49.4.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.49.4.11 2002/10/04 09:47:41 adri Exp $
+ * $Id: protos.h,v 1.49.4.12 2002/10/04 12:43:22 adri Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -155,7 +155,6 @@
 extern int comm_existsiocallback(void);
 extern void comm_calliocallback(void);
 extern void comm_read(int fd, char *buf, int len, IOCB *handler, void *data);
-extern void comm_fill(int fd, StoreIOBuffer sb, IOFCB *callback, void *data)
 
 extern void comm_accept(int fd, IOACB *handler, void *handler_data);
 extern int comm_listen(int fd);
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.51.4.2
retrieving revision 1.51.4.3
diff -u -r1.51.4.2 -r1.51.4.3
--- squid/src/structs.h	26 Sep 2002 04:12:24 -0000	1.51.4.2
+++ squid/src/structs.h	4 Oct 2002 12:43:23 -0000	1.51.4.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.51.4.2 2002/09/26 04:12:24 adri Exp $
+ * $Id: structs.h,v 1.51.4.3 2002/10/04 12:43:23 adri Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -980,6 +980,7 @@
     int fd;
     http_state_flags flags;
     FwdState *fwd;
+    char buf[SQUID_TCP_SO_RCVBUF];
 };
 
 struct _icpUdpData {