[MINOR] stream_sock_data_finish() should not expose fd

stream_sock_data_finish was still using a file descriptor as only
argument, while a stream interface is preferred. This is now fixed.

diff --git a/include/proto/stream_sock.h b/include/proto/stream_sock.h
index a7bcb9937b01acb780f39aaf9b34033bb993b008..a3fd992e9ce5cee88090058f486e9b7925344cec 100644 (file)
--- a/include/proto/stream_sock.h
+++ b/include/proto/stream_sock.h
@@ -33,7 +33,7 @@
 /* main event functions used to move data between sockets and buffers */
 int stream_sock_read(int fd);
 int stream_sock_write(int fd);
-int stream_sock_data_finish(int fd);
+void stream_sock_data_finish(struct stream_interface *si);
 void stream_sock_shutr(struct stream_interface *si);
 void stream_sock_shutw(struct stream_interface *si);
 

diff --git a/src/session.c b/src/session.c
index a36bee0640507f44c23cf6b57458e9b98979185a..54b312b515a655dae9db4eb34841411e53c186c7 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -882,10 +882,10 @@ resync_stream_interface:
                        session_process_counters(s);
 
                if (s->rep->cons->state == SI_ST_EST)
-                       stream_sock_data_finish(s->rep->cons->fd);
+                       stream_sock_data_finish(s->rep->cons);
 
                if (s->req->cons->state == SI_ST_EST)
-                       stream_sock_data_finish(s->req->cons->fd);
+                       stream_sock_data_finish(s->req->cons);
 
                s->req->flags &= BF_CLEAR_READ & BF_CLEAR_WRITE & BF_CLEAR_TIMEOUT;
                s->rep->flags &= BF_CLEAR_READ & BF_CLEAR_WRITE & BF_CLEAR_TIMEOUT;

diff --git a/src/stream_sock.c b/src/stream_sock.c
index d8fdcef242e92d4d63243b171db34bc27efcd6fd..c26e4801c2dc3a6a2f93440edab97137c25ecadf 100644 (file)
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -523,10 +523,11 @@ void stream_sock_shutr(struct stream_interface *si)
  * buffer flags have settled down, and before they are cleared. It doesn't
  * harm to call it as often as desired (it just slightly hurts performance).
  */
-int stream_sock_data_finish(int fd)
+void stream_sock_data_finish(struct stream_interface *si)
 {
-       struct buffer *ib = fdtab[fd].cb[DIR_RD].b;
-       struct buffer *ob = fdtab[fd].cb[DIR_WR].b;
+       struct buffer *ib = si->ib;
+       struct buffer *ob = si->ob;
+       int fd = si->fd;
 
        DPRINTF(stderr,"[%u] %s: fd=%d owner=%p ib=%p, ob=%p, exp(r,w)=%u,%u ibf=%08x obf=%08x ibl=%d obl=%d si=%d\n",
                now_ms, __FUNCTION__,
@@ -534,7 +535,7 @@ int stream_sock_data_finish(int fd)
                ib, ob,
                ib->rex, ob->wex,
                ib->flags, ob->flags,
-               ib->l, ob->l, ob->cons->state);
+               ib->l, ob->l, si->state);
 
        /* Check if we need to close the read side */
        if (!(ib->flags & BF_SHUTR)) {
@@ -583,7 +584,6 @@ int stream_sock_data_finish(int fd)
                        }
                }
        }
-       return 0;
 }