mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-21 12:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: connection: make use of the new polling functions

Browse Source 
Now the connection handler, the handshake callbacks and the I/O callbacks
make use of the connection-layer polling functions to enable or disable
polling on a file descriptor.

Some changes still need to be done to avoid using the FD_WAIT_* constants.
This commit is contained in:
Willy Tarreau
2012-08-17 17:33:53 +02:00
committed by Willy Tarreau
parent b5e2cbdcc8
commit f9dabecd03
6 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/stream_interface.c
View File

@@ -550,10 +550,12 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag)
conn->flags |= CO_FL_ERROR;
fdtab[fd].ev &= ~FD_POLL_STICKY;
fd_stop_both(fd);
conn_sock_stop_both(conn);
goto out_leave;
out_wait:
conn_sock_stop_recv(conn);
conn_sock_poll_send(conn);
return FD_WAIT_WRITE;
}
@@ -582,7 +584,7 @@ void stream_sock_update_conn(struct connection *conn)
if (((si->ob->flags & (BF_SHUTW|BF_HIJACK|BF_SHUTW_NOW)) == BF_SHUTW_NOW) &&
(si->state == SI_ST_EST))
stream_int_shutw(si);
fd_stop_send(fd);
conn_data_stop_send(conn);
si->ob->wex = TICK_ETERNITY;
}
@@ -627,7 +629,7 @@ void stream_sock_update_conn(struct connection *conn)
}
if (si->flags & SI_FL_WAIT_ROOM) {
fd_stop_recv(fd);
conn_data_stop_recv(conn);
si->ib->rex = TICK_ETERNITY;
}
else if ((si->ib->flags & (BF_SHUTR|BF_READ_PARTIAL|BF_FULL|BF_DONT_READ|BF_READ_NOEXP)) == BF_READ_PARTIAL) {