[MEDIUM] got rid of event_{cli,srv}_read() in favor of stream_sock_read()
diff --git a/include/proto/stream_sock.h b/include/proto/stream_sock.h
index 31184b1..9cd4a16 100644
--- a/include/proto/stream_sock.h
+++ b/include/proto/stream_sock.h
@@ -29,10 +29,10 @@
#include <common/config.h>
+int stream_sock_read(int fd);
+
/* FIXME: merge those ones together */
-int event_cli_read(int fd);
int event_cli_write(int fd);
-int event_srv_read(int fd);
int event_srv_write(int fd);
diff --git a/include/types/buffers.h b/include/types/buffers.h
index 2099b5d..b96d14b 100644
--- a/include/types/buffers.h
+++ b/include/types/buffers.h
@@ -59,6 +59,12 @@
struct buffer {
u_int32_t flags; /* BF_* */
+ struct timeval rex; /* expiration date for a read */
+ struct timeval wex; /* expiration date for a write */
+ struct timeval cex; /* expiration date for a connect */
+ int rto; /* read timeout */
+ int wto; /* write timeout */
+ int cto; /* connect timeout */
unsigned int l; /* data length */
char *r, *w, *h, *lr; /* read ptr, write ptr, last header ptr, last read */
char *rlim; /* read limit, used for header rewriting */
diff --git a/include/types/session.h b/include/types/session.h
index 9e35842..d3dfa8c 100644
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -101,11 +101,6 @@
struct session {
struct task *task; /* the task associated with this session */
/* application specific below */
- struct timeval crexpire; /* expiration date for a client read */
- struct timeval cwexpire; /* expiration date for a client write */
- struct timeval srexpire; /* expiration date for a server read */
- struct timeval swexpire; /* expiration date for a server write */
- struct timeval cnexpire; /* expiration date for a connect */
struct proxy *proxy; /* the proxy this socket belongs to */
int cli_fd; /* the client side fd */
int srv_fd; /* the server side fd */