[MAJOR] rework of the server FSM
srv_state has been removed from HTTP state machines, and states
have been split in either TCP states or analyzers. For instance,
the TARPIT state has just become a simple analyzer.
New flags have been added to the struct buffer to compensate this.
The high-level stream processors sometimes need to force a disconnection
without touching a file-descriptor (eg: report an error). But if
they touched BF_SHUTW or BF_SHUTR, the file descriptor would not
be closed. Thus, the two SHUT?_NOW flags have been added so that
an application can request a forced close which the stream interface
will be forced to obey.
During this change, a new BF_HIJACK flag was added. It will
be used for data generation, eg during a stats dump. It
prevents the producer on a buffer from sending data into it.
BF_SHUTR_NOW /* the producer must shut down for reads ASAP */
BF_SHUTW_NOW /* the consumer must shut down for writes ASAP */
BF_HIJACK /* the producer is temporarily replaced */
BF_SHUTW_NOW has precedence over BF_HIJACK. BF_HIJACK has
precedence over BF_MAY_FORWARD (so that it does not need it).
New functions buffer_shutr_now(), buffer_shutw_now(), buffer_abort()
are provided to manipulate BF_SHUT* flags.
A new type "stream_interface" has been added to describe both
sides of a buffer. A stream interface has states and error
reporting. The session now has two stream interfaces (one per
side). Each buffer has stream_interface pointers to both
consumer and producer sides.
The server-side file descriptor has moved to its stream interface,
so that even the buffer has access to it.
process_srv() has been split into three parts :
- tcp_get_connection() obtains a connection to the server
- tcp_connection_failed() tests if a previously attempted
connection has succeeded or not.
- process_srv_data() only manages the data phase, and in
this sense should be roughly equivalent to process_cli.
Little code has been removed, and a lot of old code has been
left in comments for now.
diff --git a/src/senddata.c b/src/senddata.c
index 6bc5915..dea2c96 100644
--- a/src/senddata.c
+++ b/src/senddata.c
@@ -48,16 +48,19 @@
*/
void client_retnclose(struct session *s, const struct chunk *msg)
{
- EV_FD_CLR(s->cli_fd, DIR_RD);
- EV_FD_SET(s->cli_fd, DIR_WR);
- buffer_shutr(s->req);
- buffer_flush(s->req);
- s->rep->wex = tick_add_ifset(now_ms, s->rep->wto);
- s->rep->flags |= BF_MAY_FORWARD;
+ //FIXME: must move to lower level
+ //EV_FD_CLR(s->cli_fd, DIR_RD);
+ //EV_FD_SET(s->cli_fd, DIR_WR);
+ buffer_abort(s->req);
+
s->cli_state = CL_STSHUTR; // FIXME: still used by unix sockets
buffer_flush(s->rep);
+ buffer_shutr_now(s->rep);
if (msg && msg->len)
buffer_write(s->rep, msg->str, msg->len);
+
+ s->rep->wex = tick_add_ifset(now_ms, s->rep->wto);
+ s->rep->flags |= BF_MAY_FORWARD;
}