---------------------
PatchSet 1676 
Date: 2001/02/28 14:39:40
Author: hno
Branch: eventio
Tag: (none) 
Log:
ncomm_read split into ncomm_read and ncomm_read_limited

Members: 
	src/ncomm.c:1.1.2.13->1.1.2.14 
	src/ncomm_test.c:1.1.2.7->1.1.2.8 
	src/protos.h:1.18.8.10->1.18.8.11 

Index: squid/src/ncomm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/ncomm.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- squid/src/ncomm.c	26 Feb 2001 22:19:59 -0000	1.1.2.13
+++ squid/src/ncomm.c	28 Feb 2001 14:39:40 -0000	1.1.2.14
@@ -230,7 +230,7 @@
 }
 
 void
-ncomm_read(filehandle *fh, size_t size, COMMIOCB *callback, void *cbdata)
+ncomm_read_limited(filehandle *fh, size_t size, COMMIOCB *callback, void *cbdata)
 {
     fh_read_t *fhr = &fh->read;
     int done;
@@ -249,6 +249,12 @@
     }
 }
 
+void
+ncomm_read(filehandle *fh, COMMIOCB *callback, void *cbdata)
+{
+    ncomm_read_limited(fh, 65536, callback, cbdata);
+}
+
 static void
 comm_write_callback(filehandle *fh, fh_write_t *fhw, int len, int error)
 {
Index: squid/src/ncomm_test.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/ncomm_test.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- squid/src/ncomm_test.c	28 Feb 2001 14:26:16 -0000	1.1.2.7
+++ squid/src/ncomm_test.c	28 Feb 2001 14:39:40 -0000	1.1.2.8
@@ -25,7 +25,7 @@
     printf("Got %d server bytes\n", len);
     if (len > 0) {
 	ncomm_write(conn->client, buf, NULL, NULL);
-	ncomm_read(fh, 65536, got_server_data, conn);
+	ncomm_read(fh, got_server_data, conn);
     } else {
 	ncomm_close(conn->client);
 	if (ncomm_closed(fh))
@@ -40,7 +40,7 @@
     printf("Got %d client bytes\n", len);
     if (len > 0) {
 	ncomm_write(conn->server, buf, NULL, NULL);
-	ncomm_read(fh, 65536, got_client_data, conn);
+	ncomm_read(fh, got_client_data, conn);
     } else {
 	ncomm_close(conn->server);
 	if (ncomm_closed(fh))
@@ -57,8 +57,8 @@
 	fatal("server connect failed");
     }
     conn->server = cbdataReference(fh);
-    ncomm_read(conn->client, 65536, got_client_data, conn);
-    ncomm_read(conn->server, 65536, got_server_data, conn);
+    ncomm_read(conn->client, got_client_data, conn);
+    ncomm_read(conn->server, got_server_data, conn);
 }
 
 static void
Index: squid/src/protos.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/protos.h,v
retrieving revision 1.18.8.10
retrieving revision 1.18.8.11
diff -u -r1.18.8.10 -r1.18.8.11
--- squid/src/protos.h	26 Feb 2001 22:19:59 -0000	1.18.8.10
+++ squid/src/protos.h	28 Feb 2001 14:39:40 -0000	1.18.8.11
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.18.8.10 2001/02/26 22:19:59 hno Exp $
+ * $Id: protos.h,v 1.18.8.11 2001/02/28 14:39:40 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1310,7 +1310,8 @@
 filehandle * ncomm_listen(int sock_type, int proto, struct sockaddr *where, int addrsize, int backlog, COMMNEWCB *callback, void *cbdata);
 filehandle * ncomm_accept(int sock_type, int proto, struct sockaddr *where, struct sockaddr *from, int addrsize, COMMNEWCB callback, void *cbdata);
 filehandle * ncomm_connect(int sock_type, int proto, const struct sockaddr *local, const struct sockaddr *remote, int addrsize, COMMNEWCB *callback, void *cbdata);
-void ncomm_read(filehandle *fh, size_t max_size, COMMIOCB *callback, void *cbdata);
+void ncomm_read(filehandle *fh, COMMIOCB *callback, void *cbdata);
+void ncomm_read_limited(filehandle *fh, size_t max_size, COMMIOCB *callback, void *cbdata);
 void ncomm_write(filehandle *fh, IOBuf *buf, COMMIOCB *callback, void *cbdata);
 void ncomm_write_fragment(filehandle *fh, IOBuf *buf, size_t offset, size_t len, COMMIOCB *callback, void *cbdata);
 void ncomm_write_mbuf(filehandle *fh, MemBuf mb, COMMIOCB *callback, void *cbdata);