[MAJOR] add a connection error state to the stream_interface
Tracking connection status changes was hard, and some code was
redundant. A new SI_ST_CER state was added to the stream interface
to indicate a past connection error, and an SI_FL_ERR flag was
added to report past I/O error. The stream_sock code does not set
the connection to SI_ST_CLO anymore in case of I/O error, it's
the upper layer which does it. This makes it possible to know
exactly when the file descriptors are allocated.
The new SI_ST_CER state permitted to split tcp_connection_status()
in two parts, one processing SI_ST_CON and the other one SI_ST_CER.
Synchronous connection errors now make use of this last state, hence
eliminating duplicate code.
Some ib<->ob copy paste errors were found and fixed, and all entities
setting SI_ST_CLO also shut the buffers down.
Some of these stream_interface specific functions and structures
have migrated to a new stream_interface.c file.
Some types of errors are still not detected by the buffers. For
instance, let's assume the following scenario in one single pass
of process_session: a connection sits in SI_ST_TAR state during
a retry. At TAR expiration, a new connection attempt is made, the
connection is obtained and srv->cur_sess is increased. Then the
buffer timeout is fires and everything is cleared, the new state
becomes SI_ST_CLO. The cleaning code checks that previous state
was either SI_ST_CON or SI_ST_EST to release the connection. But
that's wrong because last state is still SI_ST_TAR. So the
server's connection count does not get decreased.
This means that prev_state must not be used, and must be replaced
by some transition detection instead of level detection.
The following debugging line was useful to track state changes :
fprintf(stderr, "%s:%d: cs=%d ss=%d(%d) rqf=0x%08x rpf=0x%08x\n", __FUNCTION__, __LINE__,
s->si[0].state, s->si[1].state, s->si[1].err_type, s->req->flags, s-> rep->flags);
2008-11-03 05:26:53 +00:00
|
|
|
/*
|
2009-10-18 21:56:35 +00:00
|
|
|
* include/proto/stream_interface.h
|
|
|
|
* This file contains stream_interface function prototypes
|
|
|
|
*
|
2012-05-11 15:47:17 +00:00
|
|
|
* Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
|
2009-10-18 21:56:35 +00:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation, version 2.1
|
|
|
|
* exclusively.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
*/
|
[MAJOR] add a connection error state to the stream_interface
Tracking connection status changes was hard, and some code was
redundant. A new SI_ST_CER state was added to the stream interface
to indicate a past connection error, and an SI_FL_ERR flag was
added to report past I/O error. The stream_sock code does not set
the connection to SI_ST_CLO anymore in case of I/O error, it's
the upper layer which does it. This makes it possible to know
exactly when the file descriptors are allocated.
The new SI_ST_CER state permitted to split tcp_connection_status()
in two parts, one processing SI_ST_CON and the other one SI_ST_CER.
Synchronous connection errors now make use of this last state, hence
eliminating duplicate code.
Some ib<->ob copy paste errors were found and fixed, and all entities
setting SI_ST_CLO also shut the buffers down.
Some of these stream_interface specific functions and structures
have migrated to a new stream_interface.c file.
Some types of errors are still not detected by the buffers. For
instance, let's assume the following scenario in one single pass
of process_session: a connection sits in SI_ST_TAR state during
a retry. At TAR expiration, a new connection attempt is made, the
connection is obtained and srv->cur_sess is increased. Then the
buffer timeout is fires and everything is cleared, the new state
becomes SI_ST_CLO. The cleaning code checks that previous state
was either SI_ST_CON or SI_ST_EST to release the connection. But
that's wrong because last state is still SI_ST_TAR. So the
server's connection count does not get decreased.
This means that prev_state must not be used, and must be replaced
by some transition detection instead of level detection.
The following debugging line was useful to track state changes :
fprintf(stderr, "%s:%d: cs=%d ss=%d(%d) rqf=0x%08x rpf=0x%08x\n", __FUNCTION__, __LINE__,
s->si[0].state, s->si[1].state, s->si[1].err_type, s->req->flags, s-> rep->flags);
2008-11-03 05:26:53 +00:00
|
|
|
|
|
|
|
#ifndef _PROTO_STREAM_INTERFACE_H
|
|
|
|
#define _PROTO_STREAM_INTERFACE_H
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
#include <common/config.h>
|
2012-07-06 15:12:34 +00:00
|
|
|
#include <types/session.h>
|
[MAJOR] add a connection error state to the stream_interface
Tracking connection status changes was hard, and some code was
redundant. A new SI_ST_CER state was added to the stream interface
to indicate a past connection error, and an SI_FL_ERR flag was
added to report past I/O error. The stream_sock code does not set
the connection to SI_ST_CLO anymore in case of I/O error, it's
the upper layer which does it. This makes it possible to know
exactly when the file descriptors are allocated.
The new SI_ST_CER state permitted to split tcp_connection_status()
in two parts, one processing SI_ST_CON and the other one SI_ST_CER.
Synchronous connection errors now make use of this last state, hence
eliminating duplicate code.
Some ib<->ob copy paste errors were found and fixed, and all entities
setting SI_ST_CLO also shut the buffers down.
Some of these stream_interface specific functions and structures
have migrated to a new stream_interface.c file.
Some types of errors are still not detected by the buffers. For
instance, let's assume the following scenario in one single pass
of process_session: a connection sits in SI_ST_TAR state during
a retry. At TAR expiration, a new connection attempt is made, the
connection is obtained and srv->cur_sess is increased. Then the
buffer timeout is fires and everything is cleared, the new state
becomes SI_ST_CLO. The cleaning code checks that previous state
was either SI_ST_CON or SI_ST_EST to release the connection. But
that's wrong because last state is still SI_ST_TAR. So the
server's connection count does not get decreased.
This means that prev_state must not be used, and must be replaced
by some transition detection instead of level detection.
The following debugging line was useful to track state changes :
fprintf(stderr, "%s:%d: cs=%d ss=%d(%d) rqf=0x%08x rpf=0x%08x\n", __FUNCTION__, __LINE__,
s->si[0].state, s->si[1].state, s->si[1].err_type, s->req->flags, s-> rep->flags);
2008-11-03 05:26:53 +00:00
|
|
|
#include <types/stream_interface.h>
|
2012-08-30 20:23:13 +00:00
|
|
|
#include <proto/channel.h>
|
2012-08-17 15:33:53 +00:00
|
|
|
#include <proto/connection.h>
|
[MAJOR] add a connection error state to the stream_interface
Tracking connection status changes was hard, and some code was
redundant. A new SI_ST_CER state was added to the stream interface
to indicate a past connection error, and an SI_FL_ERR flag was
added to report past I/O error. The stream_sock code does not set
the connection to SI_ST_CLO anymore in case of I/O error, it's
the upper layer which does it. This makes it possible to know
exactly when the file descriptors are allocated.
The new SI_ST_CER state permitted to split tcp_connection_status()
in two parts, one processing SI_ST_CON and the other one SI_ST_CER.
Synchronous connection errors now make use of this last state, hence
eliminating duplicate code.
Some ib<->ob copy paste errors were found and fixed, and all entities
setting SI_ST_CLO also shut the buffers down.
Some of these stream_interface specific functions and structures
have migrated to a new stream_interface.c file.
Some types of errors are still not detected by the buffers. For
instance, let's assume the following scenario in one single pass
of process_session: a connection sits in SI_ST_TAR state during
a retry. At TAR expiration, a new connection attempt is made, the
connection is obtained and srv->cur_sess is increased. Then the
buffer timeout is fires and everything is cleared, the new state
becomes SI_ST_CLO. The cleaning code checks that previous state
was either SI_ST_CON or SI_ST_EST to release the connection. But
that's wrong because last state is still SI_ST_TAR. So the
server's connection count does not get decreased.
This means that prev_state must not be used, and must be replaced
by some transition detection instead of level detection.
The following debugging line was useful to track state changes :
fprintf(stderr, "%s:%d: cs=%d ss=%d(%d) rqf=0x%08x rpf=0x%08x\n", __FUNCTION__, __LINE__,
s->si[0].state, s->si[1].state, s->si[1].err_type, s->req->flags, s-> rep->flags);
2008-11-03 05:26:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* main event functions used to move data between sockets and buffers */
|
2009-09-20 18:14:49 +00:00
|
|
|
int stream_int_check_timeouts(struct stream_interface *si);
|
[MAJOR] add a connection error state to the stream_interface
Tracking connection status changes was hard, and some code was
redundant. A new SI_ST_CER state was added to the stream interface
to indicate a past connection error, and an SI_FL_ERR flag was
added to report past I/O error. The stream_sock code does not set
the connection to SI_ST_CLO anymore in case of I/O error, it's
the upper layer which does it. This makes it possible to know
exactly when the file descriptors are allocated.
The new SI_ST_CER state permitted to split tcp_connection_status()
in two parts, one processing SI_ST_CON and the other one SI_ST_CER.
Synchronous connection errors now make use of this last state, hence
eliminating duplicate code.
Some ib<->ob copy paste errors were found and fixed, and all entities
setting SI_ST_CLO also shut the buffers down.
Some of these stream_interface specific functions and structures
have migrated to a new stream_interface.c file.
Some types of errors are still not detected by the buffers. For
instance, let's assume the following scenario in one single pass
of process_session: a connection sits in SI_ST_TAR state during
a retry. At TAR expiration, a new connection attempt is made, the
connection is obtained and srv->cur_sess is increased. Then the
buffer timeout is fires and everything is cleared, the new state
becomes SI_ST_CLO. The cleaning code checks that previous state
was either SI_ST_CON or SI_ST_EST to release the connection. But
that's wrong because last state is still SI_ST_TAR. So the
server's connection count does not get decreased.
This means that prev_state must not be used, and must be replaced
by some transition detection instead of level detection.
The following debugging line was useful to track state changes :
fprintf(stderr, "%s:%d: cs=%d ss=%d(%d) rqf=0x%08x rpf=0x%08x\n", __FUNCTION__, __LINE__,
s->si[0].state, s->si[1].state, s->si[1].err_type, s->req->flags, s-> rep->flags);
2008-11-03 05:26:53 +00:00
|
|
|
void stream_int_report_error(struct stream_interface *si);
|
2008-11-30 18:48:07 +00:00
|
|
|
void stream_int_retnclose(struct stream_interface *si, const struct chunk *msg);
|
2012-07-06 15:12:34 +00:00
|
|
|
int conn_si_send_proxy(struct connection *conn, unsigned int flag);
|
2012-08-20 13:38:41 +00:00
|
|
|
void stream_sock_read0(struct stream_interface *si);
|
[MAJOR] add a connection error state to the stream_interface
Tracking connection status changes was hard, and some code was
redundant. A new SI_ST_CER state was added to the stream interface
to indicate a past connection error, and an SI_FL_ERR flag was
added to report past I/O error. The stream_sock code does not set
the connection to SI_ST_CLO anymore in case of I/O error, it's
the upper layer which does it. This makes it possible to know
exactly when the file descriptors are allocated.
The new SI_ST_CER state permitted to split tcp_connection_status()
in two parts, one processing SI_ST_CON and the other one SI_ST_CER.
Synchronous connection errors now make use of this last state, hence
eliminating duplicate code.
Some ib<->ob copy paste errors were found and fixed, and all entities
setting SI_ST_CLO also shut the buffers down.
Some of these stream_interface specific functions and structures
have migrated to a new stream_interface.c file.
Some types of errors are still not detected by the buffers. For
instance, let's assume the following scenario in one single pass
of process_session: a connection sits in SI_ST_TAR state during
a retry. At TAR expiration, a new connection attempt is made, the
connection is obtained and srv->cur_sess is increased. Then the
buffer timeout is fires and everything is cleared, the new state
becomes SI_ST_CLO. The cleaning code checks that previous state
was either SI_ST_CON or SI_ST_EST to release the connection. But
that's wrong because last state is still SI_ST_TAR. So the
server's connection count does not get decreased.
This means that prev_state must not be used, and must be replaced
by some transition detection instead of level detection.
The following debugging line was useful to track state changes :
fprintf(stderr, "%s:%d: cs=%d ss=%d(%d) rqf=0x%08x rpf=0x%08x\n", __FUNCTION__, __LINE__,
s->si[0].state, s->si[1].state, s->si[1].err_type, s->req->flags, s-> rep->flags);
2008-11-03 05:26:53 +00:00
|
|
|
|
2012-08-24 16:12:41 +00:00
|
|
|
extern struct si_ops si_embedded_ops;
|
|
|
|
extern struct si_ops si_conn_ops;
|
2012-10-02 22:41:04 +00:00
|
|
|
extern struct data_cb si_conn_cb;
|
2012-05-07 15:15:39 +00:00
|
|
|
|
2009-09-05 18:57:35 +00:00
|
|
|
struct task *stream_int_register_handler(struct stream_interface *si,
|
2011-02-13 12:16:36 +00:00
|
|
|
struct si_applet *app);
|
2009-09-05 18:57:35 +00:00
|
|
|
void stream_int_unregister_handler(struct stream_interface *si);
|
|
|
|
|
2013-10-24 09:51:38 +00:00
|
|
|
/* initializes a stream interface in the SI_ST_INI state. It's detached from
|
|
|
|
* any endpoint and is only attached to an owner (generally a task).
|
|
|
|
*/
|
|
|
|
static inline void si_reset(struct stream_interface *si, void *owner)
|
|
|
|
{
|
|
|
|
si->owner = owner;
|
|
|
|
si->err_type = SI_ET_NONE;
|
|
|
|
si->conn_retries = 0; /* used for logging too */
|
|
|
|
si->exp = TICK_ETERNITY;
|
|
|
|
si->flags = SI_FL_NONE;
|
|
|
|
si->end = NULL;
|
|
|
|
si->state = si->prev_state = SI_ST_INI;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sets the current and previous state of a stream interface to <state>. This
|
|
|
|
* is mainly used to create one in the established state on incoming
|
|
|
|
* conncetions.
|
|
|
|
*/
|
|
|
|
static inline void si_set_state(struct stream_interface *si, int state)
|
|
|
|
{
|
|
|
|
si->state = si->prev_state = state;
|
|
|
|
}
|
|
|
|
|
2013-10-11 17:34:20 +00:00
|
|
|
/* release the endpoint if it's a connection, then nullify it */
|
|
|
|
static inline void si_release_endpoint(struct stream_interface *si)
|
2013-09-29 15:19:56 +00:00
|
|
|
{
|
2013-10-11 17:34:20 +00:00
|
|
|
struct connection *conn;
|
|
|
|
|
|
|
|
conn = objt_conn(si->end);
|
|
|
|
if (conn)
|
|
|
|
pool_free2(pool2_connection, conn);
|
2013-09-29 14:05:22 +00:00
|
|
|
si->end = NULL;
|
2013-10-24 18:03:27 +00:00
|
|
|
si->appctx.applet = NULL;
|
2013-09-29 15:19:56 +00:00
|
|
|
}
|
|
|
|
|
2013-10-11 17:34:20 +00:00
|
|
|
static inline void si_detach(struct stream_interface *si)
|
|
|
|
{
|
|
|
|
si_release_endpoint(si);
|
|
|
|
si->ops = &si_embedded_ops;
|
|
|
|
}
|
|
|
|
|
2013-10-24 13:50:53 +00:00
|
|
|
/* Attach connection <conn> to the stream interface <si>. The stream interface
|
|
|
|
* is configured to work with a connection and the connection it configured
|
|
|
|
* with a stream interface data layer.
|
2013-10-01 08:45:07 +00:00
|
|
|
*/
|
2013-10-24 13:50:53 +00:00
|
|
|
static inline void si_attach_conn(struct stream_interface *si, struct connection *conn)
|
2012-10-02 18:57:19 +00:00
|
|
|
{
|
|
|
|
si->ops = &si_conn_ops;
|
2013-10-01 08:45:07 +00:00
|
|
|
si->end = &conn->obj_type;
|
2013-10-24 13:31:04 +00:00
|
|
|
conn_attach(conn, si, &si_conn_cb);
|
2012-10-02 18:57:19 +00:00
|
|
|
}
|
|
|
|
|
2013-10-24 13:50:53 +00:00
|
|
|
static inline void si_attach_applet(struct stream_interface *si, struct si_applet *applet)
|
2012-08-24 16:12:41 +00:00
|
|
|
{
|
2013-10-11 17:34:20 +00:00
|
|
|
si_release_endpoint(si);
|
2012-08-24 16:12:41 +00:00
|
|
|
si->ops = &si_embedded_ops;
|
2013-10-24 18:03:27 +00:00
|
|
|
si->appctx.applet = applet;
|
2013-09-29 15:19:56 +00:00
|
|
|
si->appctx.obj_type = OBJ_TYPE_APPCTX;
|
|
|
|
si->end = &si->appctx.obj_type;
|
2012-08-24 16:12:41 +00:00
|
|
|
}
|
|
|
|
|
2013-10-24 18:10:45 +00:00
|
|
|
/* returns a pointer to the applet being run in the SI or NULL if none */
|
|
|
|
static inline const struct si_applet *si_applet(struct stream_interface *si)
|
|
|
|
{
|
2013-09-29 15:19:56 +00:00
|
|
|
if (objt_appctx(si->end))
|
|
|
|
return si->appctx.applet;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Call the applet's main function when an appctx is attached to the stream
|
|
|
|
* interface. Returns zero if no call was made, or non-zero if a call was made.
|
|
|
|
*/
|
|
|
|
static inline int si_applet_call(struct stream_interface *si)
|
|
|
|
{
|
|
|
|
const struct si_applet *applet;
|
|
|
|
|
|
|
|
applet = si_applet(si);
|
|
|
|
if (applet) {
|
|
|
|
applet->fct(si);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
2013-10-24 18:10:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* call the applet's release function if any. Needs to be called upon close() */
|
|
|
|
static inline void si_applet_release(struct stream_interface *si)
|
|
|
|
{
|
|
|
|
const struct si_applet *applet;
|
|
|
|
|
|
|
|
applet = si_applet(si);
|
|
|
|
if (applet && applet->release)
|
|
|
|
applet->release(si);
|
|
|
|
}
|
|
|
|
|
2013-10-11 17:34:20 +00:00
|
|
|
/* Returns the stream interface's existing connection if one such already
|
|
|
|
* exists, or tries to allocate and initialize a new one which is then
|
|
|
|
* assigned to the stream interface.
|
|
|
|
*/
|
|
|
|
static inline struct connection *si_alloc_conn(struct stream_interface *si)
|
|
|
|
{
|
|
|
|
struct connection *conn;
|
|
|
|
|
|
|
|
/* we return the connection whether it's a real connection or NULL
|
|
|
|
* in case another entity (an applet) is registered instead.
|
|
|
|
*/
|
|
|
|
conn = objt_conn(si->end);
|
|
|
|
if (si->end)
|
|
|
|
return conn;
|
|
|
|
|
|
|
|
conn = conn_new();
|
|
|
|
if (conn)
|
|
|
|
si_attach_conn(si, conn);
|
|
|
|
|
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
|
2012-05-21 14:31:45 +00:00
|
|
|
/* Sends a shutr to the connection using the data layer */
|
|
|
|
static inline void si_shutr(struct stream_interface *si)
|
|
|
|
{
|
2013-09-29 13:16:03 +00:00
|
|
|
si->ops->shutr(si);
|
2012-05-21 14:31:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Sends a shutw to the connection using the data layer */
|
|
|
|
static inline void si_shutw(struct stream_interface *si)
|
|
|
|
{
|
2013-09-29 13:16:03 +00:00
|
|
|
si->ops->shutw(si);
|
2012-05-21 14:31:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Calls the data state update on the stream interfaace */
|
|
|
|
static inline void si_update(struct stream_interface *si)
|
|
|
|
{
|
2012-08-24 16:12:41 +00:00
|
|
|
si->ops->update(si);
|
2012-05-21 14:31:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Calls chk_rcv on the connection using the data layer */
|
|
|
|
static inline void si_chk_rcv(struct stream_interface *si)
|
|
|
|
{
|
2012-08-24 16:12:41 +00:00
|
|
|
si->ops->chk_rcv(si);
|
2012-05-21 14:31:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Calls chk_snd on the connection using the data layer */
|
|
|
|
static inline void si_chk_snd(struct stream_interface *si)
|
|
|
|
{
|
2012-08-24 16:12:41 +00:00
|
|
|
si->ops->chk_snd(si);
|
2012-05-21 14:31:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Calls chk_snd on the connection using the ctrl layer */
|
|
|
|
static inline int si_connect(struct stream_interface *si)
|
|
|
|
{
|
2013-10-01 08:45:07 +00:00
|
|
|
struct connection *conn = objt_conn(si->end);
|
2012-08-30 20:23:13 +00:00
|
|
|
int ret;
|
|
|
|
|
2013-10-01 08:45:07 +00:00
|
|
|
if (unlikely(!conn || !conn->ctrl || !conn->ctrl->connect))
|
2012-05-21 14:31:45 +00:00
|
|
|
return SN_ERR_INTERNAL;
|
2012-08-30 20:23:13 +00:00
|
|
|
|
2013-10-24 19:10:08 +00:00
|
|
|
ret = conn->ctrl->connect(conn, !channel_is_empty(si->ob), !!conn->send_proxy_ofs);
|
2012-08-30 20:23:13 +00:00
|
|
|
if (ret != SN_ERR_NONE)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* needs src ip/port for logging */
|
|
|
|
if (si->flags & SI_FL_SRC_ADDR)
|
2013-10-01 08:45:07 +00:00
|
|
|
conn_get_from_addr(conn);
|
2012-08-30 20:23:13 +00:00
|
|
|
|
|
|
|
/* Prepare to send a few handshakes related to the on-wire protocol. */
|
2013-10-24 19:10:08 +00:00
|
|
|
if (conn->send_proxy_ofs)
|
2013-10-01 08:45:07 +00:00
|
|
|
conn->flags |= CO_FL_SI_SEND_PROXY;
|
2012-08-30 20:23:13 +00:00
|
|
|
|
|
|
|
/* we need to be notified about connection establishment */
|
2013-10-01 08:45:07 +00:00
|
|
|
conn->flags |= CO_FL_WAKE_DATA;
|
2012-08-30 20:23:13 +00:00
|
|
|
|
|
|
|
/* we're in the process of establishing a connection */
|
|
|
|
si->state = SI_ST_CON;
|
|
|
|
|
|
|
|
return ret;
|
2012-05-21 14:31:45 +00:00
|
|
|
}
|
2012-05-11 14:16:40 +00:00
|
|
|
|
2012-12-08 16:48:47 +00:00
|
|
|
/* for debugging, reports the stream interface state name */
|
|
|
|
static inline const char *si_state_str(int state)
|
|
|
|
{
|
|
|
|
switch (state) {
|
|
|
|
case SI_ST_INI: return "INI";
|
|
|
|
case SI_ST_REQ: return "REQ";
|
|
|
|
case SI_ST_QUE: return "QUE";
|
|
|
|
case SI_ST_TAR: return "TAR";
|
|
|
|
case SI_ST_ASS: return "ASS";
|
|
|
|
case SI_ST_CON: return "CON";
|
|
|
|
case SI_ST_CER: return "CER";
|
|
|
|
case SI_ST_EST: return "EST";
|
|
|
|
case SI_ST_DIS: return "DIS";
|
|
|
|
case SI_ST_CLO: return "CLO";
|
|
|
|
default: return "???";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[MAJOR] add a connection error state to the stream_interface
Tracking connection status changes was hard, and some code was
redundant. A new SI_ST_CER state was added to the stream interface
to indicate a past connection error, and an SI_FL_ERR flag was
added to report past I/O error. The stream_sock code does not set
the connection to SI_ST_CLO anymore in case of I/O error, it's
the upper layer which does it. This makes it possible to know
exactly when the file descriptors are allocated.
The new SI_ST_CER state permitted to split tcp_connection_status()
in two parts, one processing SI_ST_CON and the other one SI_ST_CER.
Synchronous connection errors now make use of this last state, hence
eliminating duplicate code.
Some ib<->ob copy paste errors were found and fixed, and all entities
setting SI_ST_CLO also shut the buffers down.
Some of these stream_interface specific functions and structures
have migrated to a new stream_interface.c file.
Some types of errors are still not detected by the buffers. For
instance, let's assume the following scenario in one single pass
of process_session: a connection sits in SI_ST_TAR state during
a retry. At TAR expiration, a new connection attempt is made, the
connection is obtained and srv->cur_sess is increased. Then the
buffer timeout is fires and everything is cleared, the new state
becomes SI_ST_CLO. The cleaning code checks that previous state
was either SI_ST_CON or SI_ST_EST to release the connection. But
that's wrong because last state is still SI_ST_TAR. So the
server's connection count does not get decreased.
This means that prev_state must not be used, and must be replaced
by some transition detection instead of level detection.
The following debugging line was useful to track state changes :
fprintf(stderr, "%s:%d: cs=%d ss=%d(%d) rqf=0x%08x rpf=0x%08x\n", __FUNCTION__, __LINE__,
s->si[0].state, s->si[1].state, s->si[1].err_type, s->req->flags, s-> rep->flags);
2008-11-03 05:26:53 +00:00
|
|
|
#endif /* _PROTO_STREAM_INTERFACE_H */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Local variables:
|
|
|
|
* c-indent-level: 8
|
|
|
|
* c-basic-offset: 8
|
|
|
|
* End:
|
|
|
|
*/
|