RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-25 12:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels

Browse Source 
We'll soon remove direct references to the channels from the stream
interface since everything belongs to the same session, so let's
first not dereference si->ib / si->ob anymore and use macros instead.
This commit is contained in:
Willy Tarreau 2014-11-28 11:11:05 +01:00
parent a27dc19eda
commit 2bb4a96f8f
7 changed files with 294 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/proto/stream_interface.h
View File

@ -2,7 +2,7 @@
* include/proto/stream_interface.h * include/proto/stream_interface.h
* This file contains stream_interface function prototypes * This file contains stream_interface function prototypes
* *
* Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -46,6 +46,18 @@ extern struct data_cb si_idle_conn_cb;
struct appctx *stream_int_register_handler(struct stream_interface *si, struct si_applet *app); struct appctx *stream_int_register_handler(struct stream_interface *si, struct si_applet *app);
void stream_int_unregister_handler(struct stream_interface *si); void stream_int_unregister_handler(struct stream_interface *si);
/* returns the channel which receives data from this stream interface (input channel) */
static inline struct channel *si_ic(struct stream_interface *si)
{
return si->ib;
}
/* returns the channel which feeds data to this stream interface (output channel) */
static inline struct channel *si_oc(struct stream_interface *si)
{
return si->ob;
}
/* Initializes all required fields for a new appctx. Note that it does the /* Initializes all required fields for a new appctx. Note that it does the
* minimum acceptable initialization for an appctx. This means only the * minimum acceptable initialization for an appctx. This means only the
* 3 integer states st0, st1, st2 are zeroed. * 3 integer states st0, st1, st2 are zeroed.
@ -320,7 +332,7 @@ static inline int si_connect(struct stream_interface *si)
return SN_ERR_INTERNAL; return SN_ERR_INTERNAL;
if (!conn_ctrl_ready(conn) || !conn_xprt_ready(conn)) { if (!conn_ctrl_ready(conn) || !conn_xprt_ready(conn)) {
ret = conn->ctrl->connect(conn, !channel_is_empty(si->ob), 0); ret = conn->ctrl->connect(conn, !channel_is_empty(si_oc(si)), 0);
if (ret != SN_ERR_NONE) if (ret != SN_ERR_NONE)
return ret; return ret;
@ -330,7 +342,7 @@ static inline int si_connect(struct stream_interface *si)
/* we're in the process of establishing a connection */ /* we're in the process of establishing a connection */
si->state = SI_ST_CON; si->state = SI_ST_CON;
} }
else if (!channel_is_empty(si->ob)) { else if (!channel_is_empty(si_oc(si))) {
/* reuse the existing connection, we'll have to send a /* reuse the existing connection, we'll have to send a
* request there. * request there.
*/ */

122
src/dumpstats.c
View File

@ -579,7 +579,7 @@ static int stats_dump_table_head_to_buffer(struct chunk *msg, struct stream_inte
if (target && s->listener->bind_conf->level < ACCESS_LVL_OPER) if (target && s->listener->bind_conf->level < ACCESS_LVL_OPER)
chunk_appendf(msg, "# contents not dumped due to insufficient privileges\n"); chunk_appendf(msg, "# contents not dumped due to insufficient privileges\n");
if (bi_putchk(si->ib, msg) == -1) if (bi_putchk(si_ic(si), msg) == -1)
return 0; return 0;
return 1; return 1;
@ -650,7 +650,7 @@ static int stats_dump_table_entry_to_buffer(struct chunk *msg, struct stream_int
} }
chunk_appendf(msg, "\n"); chunk_appendf(msg, "\n");
if (bi_putchk(si->ib, msg) == -1) if (bi_putchk(si_ic(si), msg) == -1)
return 0; return 0;
return 1; return 1;
@ -1329,7 +1329,7 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
/* return server's effective weight at the moment */ /* return server's effective weight at the moment */
snprintf(trash.str, trash.size, "%d (initial %d)\n", sv->uweight, sv->iweight); snprintf(trash.str, trash.size, "%d (initial %d)\n", sv->uweight, sv->iweight);
bi_putstr(si->ib, trash.str); bi_putstr(si_ic(si), trash.str);
return 1; return 1;
} }
else if (strcmp(args[1], "map") == 0 || strcmp(args[1], "acl") == 0) { else if (strcmp(args[1], "map") == 0 || strcmp(args[1], "acl") == 0) {
@ -2238,8 +2238,8 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
static void cli_io_handler(struct stream_interface *si) static void cli_io_handler(struct stream_interface *si)
{ {
struct appctx *appctx = __objt_appctx(si->end); struct appctx *appctx = __objt_appctx(si->end);
struct channel *req = si->ob; struct channel *req = si_oc(si);
struct channel *res = si->ib; struct channel *res = si_ic(si);
int reql; int reql;
int len; int len;
@ -2263,12 +2263,12 @@ static void cli_io_handler(struct stream_interface *si)
/* ensure we have some output room left in the event we /* ensure we have some output room left in the event we
* would want to return some info right after parsing. * would want to return some info right after parsing.
*/ */
if (buffer_almost_full(si->ib->buf)) { if (buffer_almost_full(si_ic(si)->buf)) {
si->ib->flags |= CF_WAKE_WRITE; si_ic(si)->flags |= CF_WAKE_WRITE;
break; break;
} }
reql = bo_getline(si->ob, trash.str, trash.size); reql = bo_getline(si_oc(si), trash.str, trash.size);
if (reql <= 0) { /* closed or EOL not found */ if (reql <= 0) { /* closed or EOL not found */
if (reql == 0) if (reql == 0)
break; break;
@ -2328,7 +2328,7 @@ static void cli_io_handler(struct stream_interface *si)
} }
/* re-adjust req buffer */ /* re-adjust req buffer */
bo_skip(si->ob, reql); bo_skip(si_oc(si), reql);
req->flags |= CF_READ_DONTWAIT; /* we plan to read small requests */ req->flags |= CF_READ_DONTWAIT; /* we plan to read small requests */
} }
else { /* output functions: first check if the output buffer is closed then abort */ else { /* output functions: first check if the output buffer is closed then abort */
@ -2340,11 +2340,11 @@ static void cli_io_handler(struct stream_interface *si)
switch (appctx->st0) { switch (appctx->st0) {
case STAT_CLI_PRINT: case STAT_CLI_PRINT:
if (bi_putstr(si->ib, appctx->ctx.cli.msg) != -1) if (bi_putstr(si_ic(si), appctx->ctx.cli.msg) != -1)
appctx->st0 = STAT_CLI_PROMPT; appctx->st0 = STAT_CLI_PROMPT;
break; break;
case STAT_CLI_PRINT_FREE: case STAT_CLI_PRINT_FREE:
if (bi_putstr(si->ib, appctx->ctx.cli.err) != -1) { if (bi_putstr(si_ic(si), appctx->ctx.cli.err) != -1) {
free(appctx->ctx.cli.err); free(appctx->ctx.cli.err);
appctx->st0 = STAT_CLI_PROMPT; appctx->st0 = STAT_CLI_PROMPT;
} }
@ -2394,7 +2394,7 @@ static void cli_io_handler(struct stream_interface *si)
/* The post-command prompt is either LF alone or LF + '> ' in interactive mode */ /* The post-command prompt is either LF alone or LF + '> ' in interactive mode */
if (appctx->st0 == STAT_CLI_PROMPT) { if (appctx->st0 == STAT_CLI_PROMPT) {
if (bi_putstr(si->ib, appctx->st1 ? "\n> " : "\n") != -1) if (bi_putstr(si_ic(si), appctx->st1 ? "\n> " : "\n") != -1)
appctx->st0 = STAT_CLI_GETREQ; appctx->st0 = STAT_CLI_GETREQ;
} }
@ -2443,8 +2443,8 @@ static void cli_io_handler(struct stream_interface *si)
si_update(si); si_update(si);
/* we don't want to expire timeouts while we're processing requests */ /* we don't want to expire timeouts while we're processing requests */
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->ob->wex = TICK_ETERNITY; si_oc(si)->wex = TICK_ETERNITY;
out: out:
DPRINTF(stderr, "%s@%d: st=%d, rqf=%x, rpf=%x, rqh=%d, rqs=%d, rh=%d, rs=%d\n", DPRINTF(stderr, "%s@%d: st=%d, rqf=%x, rpf=%x, rqh=%d, rqs=%d, rh=%d, rs=%d\n",
@ -2563,7 +2563,7 @@ static int stats_dump_info_to_buffer(struct stream_interface *si)
global.node, global.desc ? global.desc : "" global.node, global.desc ? global.desc : ""
); );
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
return 1; return 1;
@ -2576,7 +2576,7 @@ static int stats_dump_info_to_buffer(struct stream_interface *si)
static int stats_dump_pools_to_buffer(struct stream_interface *si) static int stats_dump_pools_to_buffer(struct stream_interface *si)
{ {
dump_pools_to_trash(); dump_pools_to_trash();
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
return 1; return 1;
} }
@ -3625,7 +3625,7 @@ static void stats_dump_html_px_hdr(struct stream_interface *si, struct proxy *px
scope_txt[0] = 0; scope_txt[0] = 0;
if (appctx->ctx.stats.scope_len) { if (appctx->ctx.stats.scope_len) {
strcpy(scope_txt, STAT_SCOPE_PATTERN); strcpy(scope_txt, STAT_SCOPE_PATTERN);
memcpy(scope_txt + strlen(STAT_SCOPE_PATTERN), bo_ptr(si->ob->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len); memcpy(scope_txt + strlen(STAT_SCOPE_PATTERN), bo_ptr(si_oc(si)->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len);
scope_txt[strlen(STAT_SCOPE_PATTERN) + appctx->ctx.stats.scope_len] = 0; scope_txt[strlen(STAT_SCOPE_PATTERN) + appctx->ctx.stats.scope_len] = 0;
} }
@ -3741,7 +3741,7 @@ static int stats_dump_proxy_to_buffer(struct stream_interface *si, struct proxy
{ {
struct appctx *appctx = __objt_appctx(si->end); struct appctx *appctx = __objt_appctx(si->end);
struct session *s = si_sess(si); struct session *s = si_sess(si);
struct channel *rep = si->ib; struct channel *rep = si_ic(si);
struct server *sv, *svs; /* server and server-state, server-state=server or server->track */ struct server *sv, *svs; /* server and server-state, server-state=server or server->track */
struct listener *l; struct listener *l;
@ -3778,7 +3778,7 @@ static int stats_dump_proxy_to_buffer(struct stream_interface *si, struct proxy
* name does not match, skip it. * name does not match, skip it.
*/ */
if (appctx->ctx.stats.scope_len && if (appctx->ctx.stats.scope_len &&
strnistr(px->id, strlen(px->id), bo_ptr(si->ob->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len) == NULL) strnistr(px->id, strlen(px->id), bo_ptr(si_oc(si)->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len) == NULL)
return 1; return 1;
if ((appctx->ctx.stats.flags & STAT_BOUND) && if ((appctx->ctx.stats.flags & STAT_BOUND) &&
@ -4134,7 +4134,7 @@ static void stats_dump_html_info(struct stream_interface *si, struct uri_auth *u
); );
/* scope_txt = search query, appctx->ctx.stats.scope_len is always <= STAT_SCOPE_TXT_MAXLEN */ /* scope_txt = search query, appctx->ctx.stats.scope_len is always <= STAT_SCOPE_TXT_MAXLEN */
memcpy(scope_txt, bo_ptr(si->ob->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len); memcpy(scope_txt, bo_ptr(si_oc(si)->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len);
scope_txt[appctx->ctx.stats.scope_len] = '\0'; scope_txt[appctx->ctx.stats.scope_len] = '\0';
chunk_appendf(&trash, chunk_appendf(&trash,
@ -4149,7 +4149,7 @@ static void stats_dump_html_info(struct stream_interface *si, struct uri_auth *u
scope_txt[0] = 0; scope_txt[0] = 0;
if (appctx->ctx.stats.scope_len) { if (appctx->ctx.stats.scope_len) {
strcpy(scope_txt, STAT_SCOPE_PATTERN); strcpy(scope_txt, STAT_SCOPE_PATTERN);
memcpy(scope_txt + strlen(STAT_SCOPE_PATTERN), bo_ptr(si->ob->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len); memcpy(scope_txt + strlen(STAT_SCOPE_PATTERN), bo_ptr(si_oc(si)->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len);
scope_txt[strlen(STAT_SCOPE_PATTERN) + appctx->ctx.stats.scope_len] = 0; scope_txt[strlen(STAT_SCOPE_PATTERN) + appctx->ctx.stats.scope_len] = 0;
} }
@ -4312,7 +4312,7 @@ static void stats_dump_html_end()
static int stats_dump_stat_to_buffer(struct stream_interface *si, struct uri_auth *uri) static int stats_dump_stat_to_buffer(struct stream_interface *si, struct uri_auth *uri)
{ {
struct appctx *appctx = __objt_appctx(si->end); struct appctx *appctx = __objt_appctx(si->end);
struct channel *rep = si->ib; struct channel *rep = si_ic(si);
struct proxy *px; struct proxy *px;
chunk_reset(&trash); chunk_reset(&trash);
@ -4422,7 +4422,7 @@ static int stats_process_http_post(struct stream_interface *si)
goto out; goto out;
} }
reql = bo_getblk(si->ob, temp->str, s->txn.req.body_len, s->txn.req.eoh + 2); reql = bo_getblk(si_oc(si), temp->str, s->txn.req.body_len, s->txn.req.eoh + 2);
if (reql <= 0) { if (reql <= 0) {
/* we need more data */ /* we need more data */
appctx->ctx.stats.st_code = STAT_STATUS_NONE; appctx->ctx.stats.st_code = STAT_STATUS_NONE;
@ -4739,7 +4739,7 @@ static int stats_send_http_headers(struct stream_interface *si)
s->txn.status = 200; s->txn.status = 200;
s->logs.tv_request = now; s->logs.tv_request = now;
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
return 1; return 1;
@ -4756,7 +4756,7 @@ static int stats_send_http_redirect(struct stream_interface *si)
scope_txt[0] = 0; scope_txt[0] = 0;
if (appctx->ctx.stats.scope_len) { if (appctx->ctx.stats.scope_len) {
strcpy(scope_txt, STAT_SCOPE_PATTERN); strcpy(scope_txt, STAT_SCOPE_PATTERN);
memcpy(scope_txt + strlen(STAT_SCOPE_PATTERN), bo_ptr(si->ob->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len); memcpy(scope_txt + strlen(STAT_SCOPE_PATTERN), bo_ptr(si_oc(si)->buf) + appctx->ctx.stats.scope_str, appctx->ctx.stats.scope_len);
scope_txt[strlen(STAT_SCOPE_PATTERN) + appctx->ctx.stats.scope_len] = 0; scope_txt[strlen(STAT_SCOPE_PATTERN) + appctx->ctx.stats.scope_len] = 0;
} }
@ -4784,7 +4784,7 @@ static int stats_send_http_redirect(struct stream_interface *si)
s->txn.status = 303; s->txn.status = 303;
s->logs.tv_request = now; s->logs.tv_request = now;
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
return 1; return 1;
@ -4799,8 +4799,8 @@ static void http_stats_io_handler(struct stream_interface *si)
{ {
struct appctx *appctx = __objt_appctx(si->end); struct appctx *appctx = __objt_appctx(si->end);
struct session *s = si_sess(si); struct session *s = si_sess(si);
struct channel *req = si->ob; struct channel *req = si_oc(si);
struct channel *res = si->ib; struct channel *res = si_ic(si);
if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO)) if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO))
goto out; goto out;
@ -4820,7 +4820,7 @@ static void http_stats_io_handler(struct stream_interface *si)
} }
if (appctx->st0 == STAT_HTTP_DUMP) { if (appctx->st0 == STAT_HTTP_DUMP) {
unsigned int prev_len = si->ib->buf->i; unsigned int prev_len = si_ic(si)->buf->i;
unsigned int data_len; unsigned int data_len;
unsigned int last_len; unsigned int last_len;
unsigned int last_fwd = 0; unsigned int last_fwd = 0;
@ -4831,20 +4831,20 @@ static void http_stats_io_handler(struct stream_interface *si)
* the output area. For this, we temporarily disable * the output area. For this, we temporarily disable
* forwarding on the channel. * forwarding on the channel.
*/ */
last_fwd = si->ib->to_forward; last_fwd = si_ic(si)->to_forward;
si->ib->to_forward = 0; si_ic(si)->to_forward = 0;
chunk_printf(&trash, "\r\n000000\r\n"); chunk_printf(&trash, "\r\n000000\r\n");
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
si->ib->to_forward = last_fwd; si_ic(si)->to_forward = last_fwd;
goto fail; goto fail;
} }
} }
data_len = si->ib->buf->i; data_len = si_ic(si)->buf->i;
if (stats_dump_stat_to_buffer(si, s->be->uri_auth)) if (stats_dump_stat_to_buffer(si, s->be->uri_auth))
appctx->st0 = STAT_HTTP_DONE; appctx->st0 = STAT_HTTP_DONE;
last_len = si->ib->buf->i; last_len = si_ic(si)->buf->i;
/* Now we must either adjust or remove the chunk size. This is /* Now we must either adjust or remove the chunk size. This is
* not easy because the chunk size might wrap at the end of the * not easy because the chunk size might wrap at the end of the
@ -4854,25 +4854,25 @@ static void http_stats_io_handler(struct stream_interface *si)
* applet. * applet.
*/ */
if (appctx->ctx.stats.flags & STAT_CHUNKED) { if (appctx->ctx.stats.flags & STAT_CHUNKED) {
si->ib->total -= (last_len - prev_len); si_ic(si)->total -= (last_len - prev_len);
si->ib->buf->i -= (last_len - prev_len); si_ic(si)->buf->i -= (last_len - prev_len);
if (last_len != data_len) { if (last_len != data_len) {
chunk_printf(&trash, "\r\n%06x\r\n", (last_len - data_len)); chunk_printf(&trash, "\r\n%06x\r\n", (last_len - data_len));
bi_putchk(si->ib, &trash); bi_putchk(si_ic(si), &trash);
si->ib->total += (last_len - data_len); si_ic(si)->total += (last_len - data_len);
si->ib->buf->i += (last_len - data_len); si_ic(si)->buf->i += (last_len - data_len);
} }
/* now re-enable forwarding */ /* now re-enable forwarding */
channel_forward(si->ib, last_fwd); channel_forward(si_ic(si), last_fwd);
} }
} }
if (appctx->st0 == STAT_HTTP_POST) { if (appctx->st0 == STAT_HTTP_POST) {
if (stats_process_http_post(si)) if (stats_process_http_post(si))
appctx->st0 = STAT_HTTP_LAST; appctx->st0 = STAT_HTTP_LAST;
else if (si->ob->flags & CF_SHUTR) else if (si_oc(si)->flags & CF_SHUTR)
appctx->st0 = STAT_HTTP_DONE; appctx->st0 = STAT_HTTP_DONE;
} }
@ -4884,11 +4884,11 @@ static void http_stats_io_handler(struct stream_interface *si)
if (appctx->st0 == STAT_HTTP_DONE) { if (appctx->st0 == STAT_HTTP_DONE) {
if (appctx->ctx.stats.flags & STAT_CHUNKED) { if (appctx->ctx.stats.flags & STAT_CHUNKED) {
chunk_printf(&trash, "\r\n0\r\n\r\n"); chunk_printf(&trash, "\r\n0\r\n\r\n");
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
goto fail; goto fail;
} }
/* eat the whole request */ /* eat the whole request */
bo_skip(si->ob, si->ob->buf->o); bo_skip(si_oc(si), si_oc(si)->buf->o);
res->flags |= CF_READ_NULL; res->flags |= CF_READ_NULL;
si_shutr(si); si_shutr(si);
} }
@ -4908,8 +4908,8 @@ static void http_stats_io_handler(struct stream_interface *si)
si_update(si); si_update(si);
/* we don't want to expire timeouts while we're processing requests */ /* we don't want to expire timeouts while we're processing requests */
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->ob->wex = TICK_ETERNITY; si_oc(si)->wex = TICK_ETERNITY;
out: out:
if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO)) { if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO)) {
@ -4983,7 +4983,7 @@ static int stats_dump_full_sess_to_buffer(struct stream_interface *si, struct se
if (appctx->ctx.sess.section > 0 && appctx->ctx.sess.uid != sess->uniq_id) { if (appctx->ctx.sess.section > 0 && appctx->ctx.sess.uid != sess->uniq_id) {
/* session changed, no need to go any further */ /* session changed, no need to go any further */
chunk_appendf(&trash, " *** session terminated while we were watching it ***\n"); chunk_appendf(&trash, " *** session terminated while we were watching it ***\n");
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
appctx->ctx.sess.uid = 0; appctx->ctx.sess.uid = 0;
appctx->ctx.sess.section = 0; appctx->ctx.sess.section = 0;
@ -5263,7 +5263,7 @@ static int stats_dump_full_sess_to_buffer(struct stream_interface *si, struct se
sess->txn.rsp.next, sess->res.buf->i, sess->txn.rsp.next, sess->res.buf->i,
sess->res.buf->size); sess->res.buf->size);
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
/* use other states to dump the contents */ /* use other states to dump the contents */
@ -5286,7 +5286,7 @@ static int stats_pats_list(struct stream_interface *si)
*/ */
chunk_reset(&trash); chunk_reset(&trash);
chunk_appendf(&trash, "# id (file) description\n"); chunk_appendf(&trash, "# id (file) description\n");
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
/* Now, we start the browsing of the references lists. /* Now, we start the browsing of the references lists.
@ -5311,7 +5311,7 @@ static int stats_pats_list(struct stream_interface *si)
appctx->ctx.map.ref->reference ? appctx->ctx.map.ref->reference : "", appctx->ctx.map.ref->reference ? appctx->ctx.map.ref->reference : "",
appctx->ctx.map.ref->display); appctx->ctx.map.ref->display);
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
/* let's try again later from this session. We add ourselves into /* let's try again later from this session. We add ourselves into
* this session's users so that it can remove us upon termination. * this session's users so that it can remove us upon termination.
*/ */
@ -5429,7 +5429,7 @@ static int stats_map_lookup(struct stream_interface *si)
chunk_appendf(&trash, "\n"); chunk_appendf(&trash, "\n");
/* display response */ /* display response */
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
/* let's try again later from this session. We add ourselves into /* let's try again later from this session. We add ourselves into
* this session's users so that it can remove us upon termination. * this session's users so that it can remove us upon termination.
*/ */
@ -5479,7 +5479,7 @@ static int stats_pat_list(struct stream_interface *si)
chunk_appendf(&trash, "%p %s\n", chunk_appendf(&trash, "%p %s\n",
appctx->ctx.map.elt, appctx->ctx.map.elt->pattern); appctx->ctx.map.elt, appctx->ctx.map.elt->pattern);
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
/* let's try again later from this session. We add ourselves into /* let's try again later from this session. We add ourselves into
* this session's users so that it can remove us upon termination. * this session's users so that it can remove us upon termination.
*/ */
@ -5512,7 +5512,7 @@ static int stats_dump_sess_to_buffer(struct stream_interface *si)
struct appctx *appctx = __objt_appctx(si->end); struct appctx *appctx = __objt_appctx(si->end);
struct connection *conn; struct connection *conn;
if (unlikely(si->ib->flags & (CF_WRITE_ERROR|CF_SHUTW))) { if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW))) {
/* If we're forced to shut down, we might have to remove our /* If we're forced to shut down, we might have to remove our
* reference to the last session being dumped. * reference to the last session being dumped.
*/ */
@ -5683,7 +5683,7 @@ static int stats_dump_sess_to_buffer(struct stream_interface *si)
chunk_appendf(&trash, "\n"); chunk_appendf(&trash, "\n");
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
/* let's try again later from this session. We add ourselves into /* let's try again later from this session. We add ourselves into
* this session's users so that it can remove us upon termination. * this session's users so that it can remove us upon termination.
*/ */
@ -5702,7 +5702,7 @@ static int stats_dump_sess_to_buffer(struct stream_interface *si)
else else
chunk_appendf(&trash, "Session not found.\n"); chunk_appendf(&trash, "Session not found.\n");
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
appctx->ctx.sess.target = NULL; appctx->ctx.sess.target = NULL;
@ -5765,7 +5765,7 @@ static int stats_table_request(struct stream_interface *si, int action)
* data though. * data though.
*/ */
if (unlikely(si->ib->flags & (CF_WRITE_ERROR|CF_SHUTW))) { if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW))) {
/* in case of abort, remove any refcount we might have set on an entry */ /* in case of abort, remove any refcount we might have set on an entry */
if (appctx->st2 == STAT_ST_LIST) { if (appctx->st2 == STAT_ST_LIST) {
appctx->ctx.table.entry->ref_cnt--; appctx->ctx.table.entry->ref_cnt--;
@ -5965,7 +5965,7 @@ static int stats_dump_errors_to_buffer(struct stream_interface *si)
struct appctx *appctx = __objt_appctx(si->end); struct appctx *appctx = __objt_appctx(si->end);
extern const char *monthname[12]; extern const char *monthname[12];
if (unlikely(si->ib->flags & (CF_WRITE_ERROR|CF_SHUTW))) if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW)))
return 1; return 1;
chunk_reset(&trash); chunk_reset(&trash);
@ -5982,7 +5982,7 @@ static int stats_dump_errors_to_buffer(struct stream_interface *si)
tm.tm_hour, tm.tm_min, tm.tm_sec, (int)(date.tv_usec/1000), tm.tm_hour, tm.tm_min, tm.tm_sec, (int)(date.tv_usec/1000),
error_snapshot_id); error_snapshot_id);
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
/* Socket buffer full. Let's try again later from the same point */ /* Socket buffer full. Let's try again later from the same point */
return 0; return 0;
} }
@ -6066,7 +6066,7 @@ static int stats_dump_errors_to_buffer(struct stream_interface *si)
es->b_flags, es->b_out, es->b_tot, es->b_flags, es->b_out, es->b_tot,
es->len, es->b_wrap, es->pos); es->len, es->b_wrap, es->pos);
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
/* Socket buffer full. Let's try again later from the same point */ /* Socket buffer full. Let's try again later from the same point */
return 0; return 0;
} }
@ -6078,7 +6078,7 @@ static int stats_dump_errors_to_buffer(struct stream_interface *si)
/* the snapshot changed while we were dumping it */ /* the snapshot changed while we were dumping it */
chunk_appendf(&trash, chunk_appendf(&trash,
" WARNING! update detected on this snapshot, dump interrupted. Please re-check!\n"); " WARNING! update detected on this snapshot, dump interrupted. Please re-check!\n");
if (bi_putchk(si->ib, &trash) == -1) if (bi_putchk(si_ic(si), &trash) == -1)
return 0; return 0;
goto next; goto next;
} }
@ -6093,7 +6093,7 @@ static int stats_dump_errors_to_buffer(struct stream_interface *si)
if (newptr == appctx->ctx.errors.ptr) if (newptr == appctx->ctx.errors.ptr)
return 0; return 0;
if (bi_putchk(si->ib, &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
/* Socket buffer full. Let's try again later from the same point */ /* Socket buffer full. Let's try again later from the same point */
return 0; return 0;
} }

41
src/hlua.c
View File

@ -1095,17 +1095,17 @@ __LJMP static struct hlua_socket *hlua_checksocket(lua_State *L, int ud)
static void hlua_socket_handler(struct stream_interface *si) static void hlua_socket_handler(struct stream_interface *si)
{ {
struct appctx *appctx = objt_appctx(si->end); struct appctx *appctx = objt_appctx(si->end);
struct connection *c = objt_conn(si->ib->cons->end); struct connection *c = objt_conn(si_ic(si)->cons->end);
/* Wakeup the main session if the client connection is closed. */ /* Wakeup the main session if the client connection is closed. */
if (!c || channel_output_closed(si->ib) || channel_input_closed(si->ob)) { if (!c || channel_output_closed(si_ic(si)) || channel_input_closed(si_oc(si))) {
if (appctx->ctx.hlua.socket) { if (appctx->ctx.hlua.socket) {
appctx->ctx.hlua.socket->s = NULL; appctx->ctx.hlua.socket->s = NULL;
appctx->ctx.hlua.socket = NULL; appctx->ctx.hlua.socket = NULL;
} }
si_shutw(si); si_shutw(si);
si_shutr(si); si_shutr(si);
si->ib->flags |= CF_READ_NULL; si_ic(si)->flags |= CF_READ_NULL;
hlua_com_wake(&appctx->ctx.hlua.wake_on_read); hlua_com_wake(&appctx->ctx.hlua.wake_on_read);
hlua_com_wake(&appctx->ctx.hlua.wake_on_write); hlua_com_wake(&appctx->ctx.hlua.wake_on_write);
return; return;
@ -1118,11 +1118,11 @@ static void hlua_socket_handler(struct stream_interface *si)
appctx->ctx.hlua.connected = 1; appctx->ctx.hlua.connected = 1;
/* Wake the tasks which wants to write if the buffer have avalaible space. */ /* Wake the tasks which wants to write if the buffer have avalaible space. */
if (channel_may_recv(si->ob)) if (channel_may_recv(si_oc(si)))
hlua_com_wake(&appctx->ctx.hlua.wake_on_write); hlua_com_wake(&appctx->ctx.hlua.wake_on_write);
/* Wake the tasks which wants to read if the buffer contains data. */ /* Wake the tasks which wants to read if the buffer contains data. */
if (channel_is_empty(si->ib)) if (channel_is_empty(si_ic(si)))
hlua_com_wake(&appctx->ctx.hlua.wake_on_read); hlua_com_wake(&appctx->ctx.hlua.wake_on_read);
} }
@ -1227,9 +1227,8 @@ __LJMP static int hlua_socket_receive_yield(struct lua_State *L, int status, lua
goto connection_closed; goto connection_closed;
if (wanted == HLSR_READ_LINE) { if (wanted == HLSR_READ_LINE) {
/* Read line. */ /* Read line. */
nblk = bo_getline_nc(socket->s->si[0].ob, &blk1, &len1, &blk2, &len2); nblk = bo_getline_nc(si_oc(&socket->s->si[0]), &blk1, &len1, &blk2, &len2);
if (nblk < 0) /* Connection close. */ if (nblk < 0) /* Connection close. */
goto connection_closed; goto connection_closed;
if (nblk == 0) /* No data avalaible. */ if (nblk == 0) /* No data avalaible. */
@ -1259,9 +1258,8 @@ __LJMP static int hlua_socket_receive_yield(struct lua_State *L, int status, lua
} }
else if (wanted == HLSR_READ_ALL) { else if (wanted == HLSR_READ_ALL) {
/* Read all the available data. */ /* Read all the available data. */
nblk = bo_getblk_nc(socket->s->si[0].ob, &blk1, &len1, &blk2, &len2); nblk = bo_getblk_nc(si_oc(&socket->s->si[0]), &blk1, &len1, &blk2, &len2);
if (nblk < 0) /* Connection close. */ if (nblk < 0) /* Connection close. */
goto connection_closed; goto connection_closed;
if (nblk == 0) /* No data avalaible. */ if (nblk == 0) /* No data avalaible. */
@ -1269,9 +1267,8 @@ __LJMP static int hlua_socket_receive_yield(struct lua_State *L, int status, lua
} }
else { else {
/* Read a block of data. */ /* Read a block of data. */
nblk = bo_getblk_nc(socket->s->si[0].ob, &blk1, &len1, &blk2, &len2); nblk = bo_getblk_nc(si_oc(&socket->s->si[0]), &blk1, &len1, &blk2, &len2);
if (nblk < 0) /* Connection close. */ if (nblk < 0) /* Connection close. */
goto connection_closed; goto connection_closed;
if (nblk == 0) /* No data avalaible. */ if (nblk == 0) /* No data avalaible. */
@ -1293,7 +1290,7 @@ __LJMP static int hlua_socket_receive_yield(struct lua_State *L, int status, lua
} }
/* Consume data. */ /* Consume data. */
bo_skip(socket->s->si[0].ob, len + skip_at_end); bo_skip(si_oc(&socket->s->si[0]), len + skip_at_end);
/* Don't wait anything. */ /* Don't wait anything. */
si_update(&socket->s->si[0]); si_update(&socket->s->si[0]);
@ -1448,14 +1445,14 @@ static int hlua_socket_write_yield(struct lua_State *L,int status, lua_KContext
} }
/* Check for avalaible space. */ /* Check for avalaible space. */
len = buffer_total_space(socket->s->si[0].ib->buf); len = buffer_total_space(si_ic(&socket->s->si[0])->buf);
if (len <= 0) if (len <= 0)
goto hlua_socket_write_yield_return; goto hlua_socket_write_yield_return;
/* send data */ /* send data */
if (len < send_len) if (len < send_len)
send_len = len; send_len = len;
len = bi_putblk(socket->s->si[0].ib, buf+sent, send_len); len = bi_putblk(si_ic(&socket->s->si[0]), buf+sent, send_len);
/* "Not enough space" (-1), "Buffer too little to contain /* "Not enough space" (-1), "Buffer too little to contain
* the data" (-2) are not expected because the available length * the data" (-2) are not expected because the available length
@ -1471,8 +1468,8 @@ static int hlua_socket_write_yield(struct lua_State *L,int status, lua_KContext
/* update buffers. */ /* update buffers. */
si_update(&socket->s->si[0]); si_update(&socket->s->si[0]);
socket->s->si[0].ib->rex = TICK_ETERNITY; si_ic(&socket->s->si[0])->rex = TICK_ETERNITY;
socket->s->si[0].ob->wex = TICK_ETERNITY; si_oc(&socket->s->si[0])->wex = TICK_ETERNITY;
/* Update length sent. */ /* Update length sent. */
lua_pop(L, 1); lua_pop(L, 1);
@ -2860,12 +2857,12 @@ __LJMP static int hlua_txn_close(lua_State *L)
MAY_LJMP(check_args(L, 1, "close")); MAY_LJMP(check_args(L, 1, "close"));
s = MAY_LJMP(hlua_checktxn(L, 1)); s = MAY_LJMP(hlua_checktxn(L, 1));
channel_abort(s->s->si[0].ib); channel_abort(si_ic(&s->s->si[0]));
channel_auto_close(s->s->si[0].ib); channel_auto_close(si_ic(&s->s->si[0]));
channel_erase(s->s->si[0].ib); channel_erase(si_ic(&s->s->si[0]));
channel_auto_read(s->s->si[0].ob); channel_auto_read(si_oc(&s->s->si[0]));
channel_auto_close(s->s->si[0].ob); channel_auto_close(si_oc(&s->s->si[0]));
channel_shutr_now(s->s->si[0].ob); channel_shutr_now(si_oc(&s->s->si[0]));
return 0; return 0;
} }

72
src/peers.c
View File

@ -226,7 +226,7 @@ switchstate:
appctx->st0 = PEER_SESS_ST_GETVERSION; appctx->st0 = PEER_SESS_ST_GETVERSION;
/* fall through */ /* fall through */
case PEER_SESS_ST_GETVERSION: case PEER_SESS_ST_GETVERSION:
reql = bo_getline(si->ob, trash.str, trash.size); reql = bo_getline(si_oc(si), trash.str, trash.size);
if (reql <= 0) { /* closed or EOL not found */ if (reql <= 0) { /* closed or EOL not found */
if (reql == 0) if (reql == 0)
goto out; goto out;
@ -242,7 +242,7 @@ switchstate:
else else
trash.str[reql-1] = 0; trash.str[reql-1] = 0;
bo_skip(si->ob, reql); bo_skip(si_oc(si), reql);
/* test version */ /* test version */
if (strcmp(PEER_SESSION_PROTO_NAME " 1.0", trash.str) != 0) { if (strcmp(PEER_SESSION_PROTO_NAME " 1.0", trash.str) != 0) {
@ -257,7 +257,7 @@ switchstate:
appctx->st0 = PEER_SESS_ST_GETHOST; appctx->st0 = PEER_SESS_ST_GETHOST;
/* fall through */ /* fall through */
case PEER_SESS_ST_GETHOST: case PEER_SESS_ST_GETHOST:
reql = bo_getline(si->ob, trash.str, trash.size); reql = bo_getline(si_oc(si), trash.str, trash.size);
if (reql <= 0) { /* closed or EOL not found */ if (reql <= 0) { /* closed or EOL not found */
if (reql == 0) if (reql == 0)
goto out; goto out;
@ -273,7 +273,7 @@ switchstate:
else else
trash.str[reql-1] = 0; trash.str[reql-1] = 0;
bo_skip(si->ob, reql); bo_skip(si_oc(si), reql);
/* test hostname match */ /* test hostname match */
if (strcmp(localpeer, trash.str) != 0) { if (strcmp(localpeer, trash.str) != 0) {
@ -287,7 +287,7 @@ switchstate:
case PEER_SESS_ST_GETPEER: { case PEER_SESS_ST_GETPEER: {
struct peer *curpeer; struct peer *curpeer;
char *p; char *p;
reql = bo_getline(si->ob, trash.str, trash.size); reql = bo_getline(si_oc(si), trash.str, trash.size);
if (reql <= 0) { /* closed or EOL not found */ if (reql <= 0) { /* closed or EOL not found */
if (reql == 0) if (reql == 0)
goto out; goto out;
@ -304,7 +304,7 @@ switchstate:
else else
trash.str[reql-1] = 0; trash.str[reql-1] = 0;
bo_skip(si->ob, reql); bo_skip(si_oc(si), reql);
/* parse line "<peer name> <pid>" */ /* parse line "<peer name> <pid>" */
p = strchr(trash.str, ' '); p = strchr(trash.str, ' ');
@ -340,7 +340,7 @@ switchstate:
size_t key_size; size_t key_size;
char *p; char *p;
reql = bo_getline(si->ob, trash.str, trash.size); reql = bo_getline(si_oc(si), trash.str, trash.size);
if (reql <= 0) { /* closed or EOL not found */ if (reql <= 0) { /* closed or EOL not found */
if (reql == 0) if (reql == 0)
goto out; goto out;
@ -361,7 +361,7 @@ switchstate:
else else
trash.str[reql-1] = 0; trash.str[reql-1] = 0;
bo_skip(si->ob, reql); bo_skip(si_oc(si), reql);
/* Parse line "<table name> <type> <size>" */ /* Parse line "<table name> <type> <size>" */
p = strchr(trash.str, ' '); p = strchr(trash.str, ' ');
@ -447,7 +447,7 @@ switchstate:
struct peer_session *ps = (struct peer_session *)appctx->ctx.peers.ptr; struct peer_session *ps = (struct peer_session *)appctx->ctx.peers.ptr;
repl = snprintf(trash.str, trash.size, "%d\n", PEER_SESS_SC_SUCCESSCODE); repl = snprintf(trash.str, trash.size, "%d\n", PEER_SESS_SC_SUCCESSCODE);
repl = bi_putblk(si->ib, trash.str, repl); repl = bi_putblk(si_ic(si), trash.str, repl);
if (repl <= 0) { if (repl <= 0) {
if (repl == -1) if (repl == -1)
goto out; goto out;
@ -511,7 +511,7 @@ switchstate:
goto switchstate; goto switchstate;
} }
repl = bi_putblk(si->ib, trash.str, repl); repl = bi_putblk(si_ic(si), trash.str, repl);
if (repl <= 0) { if (repl <= 0) {
if (repl == -1) if (repl == -1)
goto out; goto out;
@ -526,10 +526,10 @@ switchstate:
case PEER_SESS_ST_GETSTATUS: { case PEER_SESS_ST_GETSTATUS: {
struct peer_session *ps = (struct peer_session *)appctx->ctx.peers.ptr; struct peer_session *ps = (struct peer_session *)appctx->ctx.peers.ptr;
if (si->ib->flags & CF_WRITE_PARTIAL) if (si_ic(si)->flags & CF_WRITE_PARTIAL)
ps->statuscode = PEER_SESS_SC_CONNECTEDCODE; ps->statuscode = PEER_SESS_SC_CONNECTEDCODE;
reql = bo_getline(si->ob, trash.str, trash.size); reql = bo_getline(si_oc(si), trash.str, trash.size);
if (reql <= 0) { /* closed or EOL not found */ if (reql <= 0) { /* closed or EOL not found */
if (reql == 0) if (reql == 0)
goto out; goto out;
@ -546,7 +546,7 @@ switchstate:
else else
trash.str[reql-1] = 0; trash.str[reql-1] = 0;
bo_skip(si->ob, reql); bo_skip(si_oc(si), reql);
/* Register status code */ /* Register status code */
ps->statuscode = atoi(trash.str); ps->statuscode = atoi(trash.str);
@ -600,7 +600,7 @@ switchstate:
char c; char c;
int totl = 0; int totl = 0;
reql = bo_getblk(si->ob, (char *)&c, sizeof(c), totl); reql = bo_getblk(si_oc(si), (char *)&c, sizeof(c), totl);
if (reql <= 0) /* closed or EOL not found */ if (reql <= 0) /* closed or EOL not found */
goto incomplete; goto incomplete;
@ -617,7 +617,7 @@ switchstate:
pushack = ps->pushack + (unsigned int)(c & 0x7F); pushack = ps->pushack + (unsigned int)(c & 0x7F);
} }
else { else {
reql = bo_getblk(si->ob, (char *)&netinteger, sizeof(netinteger), totl); reql = bo_getblk(si_oc(si), (char *)&netinteger, sizeof(netinteger), totl);
if (reql <= 0) /* closed or EOL not found */ if (reql <= 0) /* closed or EOL not found */
goto incomplete; goto incomplete;
@ -638,7 +638,7 @@ switchstate:
unsigned int to_read, to_store; unsigned int to_read, to_store;
/* read size first */ /* read size first */
reql = bo_getblk(si->ob, (char *)&netinteger, sizeof(netinteger), totl); reql = bo_getblk(si_oc(si), (char *)&netinteger, sizeof(netinteger), totl);
if (reql <= 0) /* closed or EOL not found */ if (reql <= 0) /* closed or EOL not found */
goto incomplete; goto incomplete;
@ -647,7 +647,7 @@ switchstate:
to_store = 0; to_store = 0;
to_read = ntohl(netinteger); to_read = ntohl(netinteger);
if (to_read + totl > si->ob->buf->size) { if (to_read + totl > si_oc(si)->buf->size) {
/* impossible to read a key this large, abort */ /* impossible to read a key this large, abort */
reql = -1; reql = -1;
goto incomplete; goto incomplete;
@ -661,7 +661,7 @@ switchstate:
* the rest is drained into the trash. * the rest is drained into the trash.
*/ */
if (to_store) { if (to_store) {
reql = bo_getblk(si->ob, (char *)newts->key.key, to_store, totl); reql = bo_getblk(si_oc(si), (char *)newts->key.key, to_store, totl);
if (reql <= 0) /* closed or incomplete */ if (reql <= 0) /* closed or incomplete */
goto incomplete; goto incomplete;
newts->key.key[reql] = 0; newts->key.key[reql] = 0;
@ -669,14 +669,14 @@ switchstate:
to_read -= reql; to_read -= reql;
} }
if (to_read) { if (to_read) {
reql = bo_getblk(si->ob, trash.str, to_read, totl); reql = bo_getblk(si_oc(si), trash.str, to_read, totl);
if (reql <= 0) /* closed or incomplete */ if (reql <= 0) /* closed or incomplete */
goto incomplete; goto incomplete;
totl += reql; totl += reql;
} }
} }
else if (ps->table->table->type == STKTABLE_TYPE_INTEGER) { else if (ps->table->table->type == STKTABLE_TYPE_INTEGER) {
reql = bo_getblk(si->ob, (char *)&netinteger, sizeof(netinteger), totl); reql = bo_getblk(si_oc(si), (char *)&netinteger, sizeof(netinteger), totl);
if (reql <= 0) /* closed or EOL not found */ if (reql <= 0) /* closed or EOL not found */
goto incomplete; goto incomplete;
newts = stksess_new(ps->table->table, NULL); newts = stksess_new(ps->table->table, NULL);
@ -689,14 +689,14 @@ switchstate:
else { else {
/* type ip or binary */ /* type ip or binary */
newts = stksess_new(ps->table->table, NULL); newts = stksess_new(ps->table->table, NULL);
reql = bo_getblk(si->ob, newts ? (char *)newts->key.key : trash.str, ps->table->table->key_size, totl); reql = bo_getblk(si_oc(si), newts ? (char *)newts->key.key : trash.str, ps->table->table->key_size, totl);
if (reql <= 0) /* closed or EOL not found */ if (reql <= 0) /* closed or EOL not found */
goto incomplete; goto incomplete;
totl += reql; totl += reql;
} }
/* read server id */ /* read server id */
reql = bo_getblk(si->ob, (char *)&netinteger, sizeof(netinteger), totl); reql = bo_getblk(si_oc(si), (char *)&netinteger, sizeof(netinteger), totl);
if (reql <= 0) /* closed or EOL not found */ if (reql <= 0) /* closed or EOL not found */
goto incomplete; goto incomplete;
@ -803,7 +803,7 @@ switchstate:
/* ack message */ /* ack message */
uint32_t netinteger; uint32_t netinteger;
reql = bo_getblk(si->ob, (char *)&netinteger, sizeof(netinteger), totl); reql = bo_getblk(si_oc(si), (char *)&netinteger, sizeof(netinteger), totl);
if (reql <= 0) /* closed or EOL not found */ if (reql <= 0) /* closed or EOL not found */
goto incomplete; goto incomplete;
@ -819,7 +819,7 @@ switchstate:
} }
/* skip consumed message */ /* skip consumed message */
bo_skip(si->ob, totl); bo_skip(si_oc(si), totl);
/* loop on that state to peek next message */ /* loop on that state to peek next message */
goto switchstate; goto switchstate;
@ -844,7 +844,7 @@ incomplete:
/* Confirm finished or partial messages */ /* Confirm finished or partial messages */
while (ps->confirm) { while (ps->confirm) {
/* There is a confirm messages to send */ /* There is a confirm messages to send */
repl = bi_putchr(si->ib, 'c'); repl = bi_putchr(si_ic(si), 'c');
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
@ -861,7 +861,7 @@ incomplete:
!(ps->table->flags & SHTABLE_F_RESYNC_PROCESS)) { !(ps->table->flags & SHTABLE_F_RESYNC_PROCESS)) {
/* Current peer was elected to request a resync */ /* Current peer was elected to request a resync */
repl = bi_putchr(si->ib, 'R'); repl = bi_putchr(si_ic(si), 'R');
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
@ -880,7 +880,7 @@ incomplete:
netinteger = htonl(ps->pushack); netinteger = htonl(ps->pushack);
memcpy(&trash.str[1], &netinteger, sizeof(netinteger)); memcpy(&trash.str[1], &netinteger, sizeof(netinteger));
repl = bi_putblk(si->ib, trash.str, 1+sizeof(netinteger)); repl = bi_putblk(si_ic(si), trash.str, 1+sizeof(netinteger));
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
@ -916,7 +916,7 @@ incomplete:
msglen = peer_prepare_datamsg(ts, ps, trash.str, trash.size); msglen = peer_prepare_datamsg(ts, ps, trash.str, trash.size);
if (msglen) { if (msglen) {
/* message to buffer */ /* message to buffer */
repl = bi_putblk(si->ib, trash.str, msglen); repl = bi_putblk(si_ic(si), trash.str, msglen);
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
@ -950,7 +950,7 @@ incomplete:
msglen = peer_prepare_datamsg(ts, ps, trash.str, trash.size); msglen = peer_prepare_datamsg(ts, ps, trash.str, trash.size);
if (msglen) { if (msglen) {
/* message to buffer */ /* message to buffer */
repl = bi_putblk(si->ib, trash.str, msglen); repl = bi_putblk(si_ic(si), trash.str, msglen);
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
@ -966,7 +966,7 @@ incomplete:
if (!(ps->flags & PEER_F_TEACH_FINISHED)) { if (!(ps->flags & PEER_F_TEACH_FINISHED)) {
/* process final lesson message */ /* process final lesson message */
repl = bi_putchr(si->ib, ((ps->table->flags & SHTABLE_RESYNC_STATEMASK) == SHTABLE_RESYNC_FINISHED) ? 'F' : 'C'); repl = bi_putchr(si_ic(si), ((ps->table->flags & SHTABLE_RESYNC_STATEMASK) == SHTABLE_RESYNC_FINISHED) ? 'F' : 'C');
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
@ -1008,7 +1008,7 @@ incomplete:
msglen = peer_prepare_datamsg(ts, ps, trash.str, trash.size); msglen = peer_prepare_datamsg(ts, ps, trash.str, trash.size);
if (msglen) { if (msglen) {
/* message to buffer */ /* message to buffer */
repl = bi_putblk(si->ib, trash.str, msglen); repl = bi_putblk(si_ic(si), trash.str, msglen);
if (repl <= 0) { if (repl <= 0) {
/* no more write possible */ /* no more write possible */
if (repl == -1) if (repl == -1)
@ -1027,24 +1027,24 @@ incomplete:
case PEER_SESS_ST_EXIT: case PEER_SESS_ST_EXIT:
repl = snprintf(trash.str, trash.size, "%d\n", appctx->st1); repl = snprintf(trash.str, trash.size, "%d\n", appctx->st1);
if (bi_putblk(si->ib, trash.str, repl) == -1) if (bi_putblk(si_ic(si), trash.str, repl) == -1)
goto out; goto out;
appctx->st0 = PEER_SESS_ST_END; appctx->st0 = PEER_SESS_ST_END;
/* fall through */ /* fall through */
case PEER_SESS_ST_END: { case PEER_SESS_ST_END: {
si_shutw(si); si_shutw(si);
si_shutr(si); si_shutr(si);
si->ib->flags |= CF_READ_NULL; si_ic(si)->flags |= CF_READ_NULL;
goto quit; goto quit;
} }
} }
} }
out: out:
si_update(si); si_update(si);
si->ob->flags |= CF_READ_DONTWAIT; si_oc(si)->flags |= CF_READ_DONTWAIT;
/* we don't want to expire timeouts while we're processing requests */ /* we don't want to expire timeouts while we're processing requests */
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->ob->wex = TICK_ETERNITY; si_oc(si)->wex = TICK_ETERNITY;
quit: quit:
return; return;
} }

14
src/proto_http.c
View File

@ -826,15 +826,15 @@ int http_remove_header2(struct http_msg *msg, struct hdr_idx *idx, struct hdr_ct
static void http_server_error(struct session *s, struct stream_interface *si, static void http_server_error(struct session *s, struct stream_interface *si,
int err, int finst, int status, const struct chunk *msg) int err, int finst, int status, const struct chunk *msg)
{ {
channel_auto_read(si->ob); channel_auto_read(si_oc(si));
channel_abort(si->ob); channel_abort(si_oc(si));
channel_auto_close(si->ob); channel_auto_close(si_oc(si));
channel_erase(si->ob); channel_erase(si_oc(si));
channel_auto_close(si->ib); channel_auto_close(si_ic(si));
channel_auto_read(si->ib); channel_auto_read(si_ic(si));
if (status > 0 && msg) { if (status > 0 && msg) {
s->txn.status = status; s->txn.status = status;
bo_inject(si->ib, msg->str, msg->len); bo_inject(si_ic(si), msg->str, msg->len);
} }
if (!(s->flags & SN_ERR_MASK)) if (!(s->flags & SN_ERR_MASK))
s->flags |= err; s->flags |= err;

36
src/session.c
View File

@ -865,8 +865,8 @@ void session_process_counters(struct session *s)
*/ */
static int sess_update_st_con_tcp(struct session *s, struct stream_interface *si) static int sess_update_st_con_tcp(struct session *s, struct stream_interface *si)
{ {
struct channel *req = si->ob; struct channel *req = si_oc(si);
struct channel *rep = si->ib; struct channel *rep = si_ic(si);
struct connection *srv_conn = __objt_conn(si->end); struct connection *srv_conn = __objt_conn(si->end);
/* If we got an error, or if nothing happened and the connection timed /* If we got an error, or if nothing happened and the connection timed
@ -874,14 +874,14 @@ static int sess_update_st_con_tcp(struct session *s, struct stream_interface *si
* attempts and error reports. * attempts and error reports.
*/ */
if (unlikely(si->flags & (SI_FL_EXP|SI_FL_ERR))) { if (unlikely(si->flags & (SI_FL_EXP|SI_FL_ERR))) {
if (unlikely(si->ob->flags & CF_WRITE_PARTIAL)) { if (unlikely(si_oc(si)->flags & CF_WRITE_PARTIAL)) {
/* Some data were sent past the connection establishment, /* Some data were sent past the connection establishment,
* so we need to pretend we're established to log correctly * so we need to pretend we're established to log correctly
* and let later states handle the failure. * and let later states handle the failure.
*/ */
si->state = SI_ST_EST; si->state = SI_ST_EST;
si->err_type = SI_ET_DATA_ERR; si->err_type = SI_ET_DATA_ERR;
si->ib->flags |= CF_READ_ERROR | CF_WRITE_ERROR; si_ic(si)->flags |= CF_READ_ERROR | CF_WRITE_ERROR;
return 1; return 1;
} }
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
@ -962,8 +962,8 @@ static int sess_update_st_cer(struct session *s, struct stream_interface *si)
/* shutw is enough so stop a connecting socket */ /* shutw is enough so stop a connecting socket */
si_shutw(si); si_shutw(si);
si->ob->flags |= CF_WRITE_ERROR; si_oc(si)->flags |= CF_WRITE_ERROR;
si->ib->flags |= CF_READ_ERROR; si_ic(si)->flags |= CF_READ_ERROR;
si->state = SI_ST_CLO; si->state = SI_ST_CLO;
if (s->srv_error) if (s->srv_error)
@ -1033,8 +1033,8 @@ static int sess_update_st_cer(struct session *s, struct stream_interface *si)
*/ */
static void sess_establish(struct session *s, struct stream_interface *si) static void sess_establish(struct session *s, struct stream_interface *si)
{ {
struct channel *req = si->ob; struct channel *req = si_oc(si);
struct channel *rep = si->ib; struct channel *rep = si_ic(si);
/* First, centralize the timers information */ /* First, centralize the timers information */
s->logs.t_connect = tv_ms_elapsed(&s->logs.tv_accept, &now); s->logs.t_connect = tv_ms_elapsed(&s->logs.tv_accept, &now);
@ -1128,7 +1128,7 @@ static void sess_update_stream_int(struct session *s, struct stream_interface *s
/* Failed and not retryable. */ /* Failed and not retryable. */
si_shutr(si); si_shutr(si);
si_shutw(si); si_shutw(si);
si->ob->flags |= CF_WRITE_ERROR; si_oc(si)->flags |= CF_WRITE_ERROR;
s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now); s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
@ -1177,7 +1177,7 @@ static void sess_update_stream_int(struct session *s, struct stream_interface *s
s->be->be_counters.failed_conns++; s->be->be_counters.failed_conns++;
si_shutr(si); si_shutr(si);
si_shutw(si); si_shutw(si);
si->ob->flags |= CF_WRITE_TIMEOUT; si_oc(si)->flags |= CF_WRITE_TIMEOUT;
if (!si->err_type) if (!si->err_type)
si->err_type = SI_ET_QUEUE_TO; si->err_type = SI_ET_QUEUE_TO;
si->state = SI_ST_CLO; si->state = SI_ST_CLO;
@ -1187,9 +1187,9 @@ static void sess_update_stream_int(struct session *s, struct stream_interface *s
} }
/* Connection remains in queue, check if we have to abort it */ /* Connection remains in queue, check if we have to abort it */
if ((si->ob->flags & (CF_READ_ERROR)) || if ((si_oc(si)->flags & (CF_READ_ERROR)) ||
((si->ob->flags & CF_SHUTW_NOW) && /* empty and client aborted */ ((si_oc(si)->flags & CF_SHUTW_NOW) && /* empty and client aborted */
(channel_is_empty(si->ob) || s->be->options & PR_O_ABRT_CLOSE))) { (channel_is_empty(si_oc(si)) || s->be->options & PR_O_ABRT_CLOSE))) {
/* give up */ /* give up */
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now); s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
@ -1207,9 +1207,9 @@ static void sess_update_stream_int(struct session *s, struct stream_interface *s
} }
else if (si->state == SI_ST_TAR) { else if (si->state == SI_ST_TAR) {
/* Connection request might be aborted */ /* Connection request might be aborted */
if ((si->ob->flags & (CF_READ_ERROR)) || if ((si_oc(si)->flags & (CF_READ_ERROR)) ||
((si->ob->flags & CF_SHUTW_NOW) && /* empty and client aborted */ ((si_oc(si)->flags & CF_SHUTW_NOW) && /* empty and client aborted */
(channel_is_empty(si->ob) || s->be->options & PR_O_ABRT_CLOSE))) { (channel_is_empty(si_oc(si)) || s->be->options & PR_O_ABRT_CLOSE))) {
/* give up */ /* give up */
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
si_shutr(si); si_shutr(si);
@ -1299,7 +1299,7 @@ static void sess_prepare_conn_req(struct session *s, struct stream_interface *si
si_shutr(si); si_shutr(si);
si_shutw(si); si_shutw(si);
si->ob->flags |= CF_WRITE_ERROR; si_oc(si)->flags |= CF_WRITE_ERROR;
si->err_type = SI_ET_CONN_RES; si->err_type = SI_ET_CONN_RES;
si->state = SI_ST_CLO; si->state = SI_ST_CLO;
if (s->srv_error) if (s->srv_error)
@ -1326,7 +1326,7 @@ static void sess_prepare_conn_req(struct session *s, struct stream_interface *si
/* we did not get any server, let's check the cause */ /* we did not get any server, let's check the cause */
si_shutr(si); si_shutr(si);
si_shutw(si); si_shutw(si);
si->ob->flags |= CF_WRITE_ERROR; si_oc(si)->flags |= CF_WRITE_ERROR;
if (!si->err_type) if (!si->err_type)
si->err_type = SI_ET_CONN_OTHER; si->err_type = SI_ET_CONN_OTHER;
si->state = SI_ST_CLO; si->state = SI_ST_CLO;

276
src/stream_interface.c
View File

@ -106,8 +106,8 @@ void stream_int_report_error(struct stream_interface *si)
if (!si->err_type) if (!si->err_type)
si->err_type = SI_ET_DATA_ERR; si->err_type = SI_ET_DATA_ERR;
si->ob->flags |= CF_WRITE_ERROR; si_oc(si)->flags |= CF_WRITE_ERROR;
si->ib->flags |= CF_READ_ERROR; si_ic(si)->flags |= CF_READ_ERROR;
} }
/* /*
@ -121,19 +121,19 @@ void stream_int_report_error(struct stream_interface *si)
*/ */
void stream_int_retnclose(struct stream_interface *si, const struct chunk *msg) void stream_int_retnclose(struct stream_interface *si, const struct chunk *msg)
{ {
channel_auto_read(si->ib); channel_auto_read(si_ic(si));
channel_abort(si->ib); channel_abort(si_ic(si));
channel_auto_close(si->ib); channel_auto_close(si_ic(si));
channel_erase(si->ib); channel_erase(si_ic(si));
channel_truncate(si->ob); channel_truncate(si_oc(si));
if (likely(msg && msg->len)) if (likely(msg && msg->len))
bo_inject(si->ob, msg->str, msg->len); bo_inject(si_oc(si), msg->str, msg->len);
si->ob->wex = tick_add_ifset(now_ms, si->ob->wto); si_oc(si)->wex = tick_add_ifset(now_ms, si_oc(si)->wto);
channel_auto_read(si->ob); channel_auto_read(si_oc(si));
channel_auto_close(si->ob); channel_auto_close(si_oc(si));
channel_shutr_now(si->ob); channel_shutr_now(si_oc(si));
} }
/* default update function for embedded tasks, to be used at the end of the i/o handler */ /* default update function for embedded tasks, to be used at the end of the i/o handler */
@ -143,48 +143,48 @@ static void stream_int_update_embedded(struct stream_interface *si)
DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n", DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n",
__FUNCTION__, __FUNCTION__,
si, si->state, si->ib->flags, si->ob->flags); si, si->state, si_ic(si)->flags, si_oc(si)->flags);
if (si->state != SI_ST_EST) if (si->state != SI_ST_EST)
return; return;
if ((si->ob->flags & (CF_SHUTW|CF_SHUTW_NOW)) == CF_SHUTW_NOW && if ((si_oc(si)->flags & (CF_SHUTW|CF_SHUTW_NOW)) == CF_SHUTW_NOW &&
channel_is_empty(si->ob)) channel_is_empty(si_oc(si)))
si_shutw(si); si_shutw(si);
if ((si->ob->flags & (CF_SHUTW|CF_SHUTW_NOW)) == 0 && channel_may_recv(si->ob)) if ((si_oc(si)->flags & (CF_SHUTW|CF_SHUTW_NOW)) == 0 && channel_may_recv(si_oc(si)))
si->flags |= SI_FL_WAIT_DATA; si->flags |= SI_FL_WAIT_DATA;
/* we're almost sure that we need some space if the buffer is not /* we're almost sure that we need some space if the buffer is not
* empty, even if it's not full, because the applets can't fill it. * empty, even if it's not full, because the applets can't fill it.
*/ */
if ((si->ib->flags & (CF_SHUTR|CF_DONT_READ)) == 0 && !channel_is_empty(si->ib)) if ((si_ic(si)->flags & (CF_SHUTR|CF_DONT_READ)) == 0 && !channel_is_empty(si_ic(si)))
si->flags |= SI_FL_WAIT_ROOM; si->flags |= SI_FL_WAIT_ROOM;
if (si->ob->flags & CF_WRITE_ACTIVITY) { if (si_oc(si)->flags & CF_WRITE_ACTIVITY) {
if (tick_isset(si->ob->wex)) if (tick_isset(si_oc(si)->wex))
si->ob->wex = tick_add_ifset(now_ms, si->ob->wto); si_oc(si)->wex = tick_add_ifset(now_ms, si_oc(si)->wto);
} }
if (si->ib->flags & CF_READ_ACTIVITY || if (si_ic(si)->flags & CF_READ_ACTIVITY ||
(si->ob->flags & CF_WRITE_ACTIVITY && !(si->flags & SI_FL_INDEP_STR))) { (si_oc(si)->flags & CF_WRITE_ACTIVITY && !(si->flags & SI_FL_INDEP_STR))) {
if (tick_isset(si->ib->rex)) if (tick_isset(si_ic(si)->rex))
si->ib->rex = tick_add_ifset(now_ms, si->ib->rto); si_ic(si)->rex = tick_add_ifset(now_ms, si_ic(si)->rto);
} }
/* save flags to detect changes */ /* save flags to detect changes */
old_flags = si->flags; old_flags = si->flags;
if (likely((si->ob->flags & (CF_SHUTW|CF_WRITE_PARTIAL|CF_DONT_READ)) == CF_WRITE_PARTIAL && if (likely((si_oc(si)->flags & (CF_SHUTW|CF_WRITE_PARTIAL|CF_DONT_READ)) == CF_WRITE_PARTIAL &&
channel_may_recv(si->ob) && channel_may_recv(si_oc(si)) &&
(si->ob->prod->flags & SI_FL_WAIT_ROOM))) (si_oc(si)->prod->flags & SI_FL_WAIT_ROOM)))
si_chk_rcv(si->ob->prod); si_chk_rcv(si_oc(si)->prod);
if (((si->ib->flags & CF_READ_PARTIAL) && !channel_is_empty(si->ib)) && if (((si_ic(si)->flags & CF_READ_PARTIAL) && !channel_is_empty(si_ic(si))) &&
(si->ib->pipe /* always try to send spliced data */ || (si_ic(si)->pipe /* always try to send spliced data */ ||
(si->ib->buf->i == 0 && (si->ib->cons->flags & SI_FL_WAIT_DATA)))) { (si_ic(si)->buf->i == 0 && (si_ic(si)->cons->flags & SI_FL_WAIT_DATA)))) {
si_chk_snd(si->ib->cons); si_chk_snd(si_ic(si)->cons);
/* check if the consumer has freed some space */ /* check if the consumer has freed some space */
if (channel_may_recv(si->ib) && !si->ib->pipe) if (channel_may_recv(si_ic(si)) && !si_ic(si)->pipe)
si->flags &= ~SI_FL_WAIT_ROOM; si->flags &= ~SI_FL_WAIT_ROOM;
} }
@ -199,24 +199,24 @@ static void stream_int_update_embedded(struct stream_interface *si)
((old_flags & ~si->flags) & (SI_FL_WAIT_ROOM|SI_FL_WAIT_DATA)) || ((old_flags & ~si->flags) & (SI_FL_WAIT_ROOM|SI_FL_WAIT_DATA)) ||
/* changes on the production side */ /* changes on the production side */
(si->ib->flags & (CF_READ_NULL|CF_READ_ERROR)) || (si_ic(si)->flags & (CF_READ_NULL|CF_READ_ERROR)) ||
si->state != SI_ST_EST || si->state != SI_ST_EST ||
(si->flags & SI_FL_ERR) || (si->flags & SI_FL_ERR) ||
((si->ib->flags & CF_READ_PARTIAL) && ((si_ic(si)->flags & CF_READ_PARTIAL) &&
(!si->ib->to_forward || si->ib->cons->state != SI_ST_EST)) || (!si_ic(si)->to_forward || si_ic(si)->cons->state != SI_ST_EST)) ||
/* changes on the consumption side */ /* changes on the consumption side */
(si->ob->flags & (CF_WRITE_NULL|CF_WRITE_ERROR)) || (si_oc(si)->flags & (CF_WRITE_NULL|CF_WRITE_ERROR)) ||
((si->ob->flags & CF_WRITE_ACTIVITY) && ((si_oc(si)->flags & CF_WRITE_ACTIVITY) &&
((si->ob->flags & CF_SHUTW) || ((si_oc(si)->flags & CF_SHUTW) ||
((si->ob->flags & CF_WAKE_WRITE) && ((si_oc(si)->flags & CF_WAKE_WRITE) &&
(si->ob->prod->state != SI_ST_EST || (si_oc(si)->prod->state != SI_ST_EST ||
(channel_is_empty(si->ob) && !si->ob->to_forward)))))) { (channel_is_empty(si_oc(si)) && !si_oc(si)->to_forward)))))) {
if (!(si->flags & SI_FL_DONT_WAKE) && si->owner) if (!(si->flags & SI_FL_DONT_WAKE) && si->owner)
task_wakeup(si->owner, TASK_WOKEN_IO); task_wakeup(si->owner, TASK_WOKEN_IO);
} }
if (si->ib->flags & CF_READ_ACTIVITY) if (si_ic(si)->flags & CF_READ_ACTIVITY)
si->ib->flags &= ~CF_READ_DONTWAIT; si_ic(si)->flags &= ~CF_READ_DONTWAIT;
} }
/* /*
@ -229,17 +229,17 @@ static void stream_int_update_embedded(struct stream_interface *si)
*/ */
static void stream_int_shutr(struct stream_interface *si) static void stream_int_shutr(struct stream_interface *si)
{ {
si->ib->flags &= ~CF_SHUTR_NOW; si_ic(si)->flags &= ~CF_SHUTR_NOW;
if (si->ib->flags & CF_SHUTR) if (si_ic(si)->flags & CF_SHUTR)
return; return;
si->ib->flags |= CF_SHUTR; si_ic(si)->flags |= CF_SHUTR;
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->flags &= ~SI_FL_WAIT_ROOM; si->flags &= ~SI_FL_WAIT_ROOM;
if (si->state != SI_ST_EST && si->state != SI_ST_CON) if (si->state != SI_ST_EST && si->state != SI_ST_CON)
return; return;
if (si->ob->flags & CF_SHUTW) { if (si_oc(si)->flags & CF_SHUTW) {
si->state = SI_ST_DIS; si->state = SI_ST_DIS;
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
si_applet_release(si); si_applet_release(si);
@ -263,11 +263,11 @@ static void stream_int_shutr(struct stream_interface *si)
*/ */
static void stream_int_shutw(struct stream_interface *si) static void stream_int_shutw(struct stream_interface *si)
{ {
si->ob->flags &= ~CF_SHUTW_NOW; si_oc(si)->flags &= ~CF_SHUTW_NOW;
if (si->ob->flags & CF_SHUTW) if (si_oc(si)->flags & CF_SHUTW)
return; return;
si->ob->flags |= CF_SHUTW; si_oc(si)->flags |= CF_SHUTW;
si->ob->wex = TICK_ETERNITY; si_oc(si)->wex = TICK_ETERNITY;
si->flags &= ~SI_FL_WAIT_DATA; si->flags &= ~SI_FL_WAIT_DATA;
switch (si->state) { switch (si->state) {
@ -279,7 +279,7 @@ static void stream_int_shutw(struct stream_interface *si)
* no risk so we close both sides immediately. * no risk so we close both sides immediately.
*/ */
if (!(si->flags & (SI_FL_ERR | SI_FL_NOLINGER)) && if (!(si->flags & (SI_FL_ERR | SI_FL_NOLINGER)) &&
!(si->ib->flags & (CF_SHUTR|CF_DONT_READ))) !(si_ic(si)->flags & (CF_SHUTR|CF_DONT_READ)))
return; return;
/* fall through */ /* fall through */
@ -292,9 +292,9 @@ static void stream_int_shutw(struct stream_interface *si)
si_applet_release(si); si_applet_release(si);
default: default:
si->flags &= ~(SI_FL_WAIT_ROOM | SI_FL_NOLINGER); si->flags &= ~(SI_FL_WAIT_ROOM | SI_FL_NOLINGER);
si->ib->flags &= ~CF_SHUTR_NOW; si_ic(si)->flags &= ~CF_SHUTR_NOW;
si->ib->flags |= CF_SHUTR; si_ic(si)->flags |= CF_SHUTR;
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
} }
@ -306,11 +306,11 @@ static void stream_int_shutw(struct stream_interface *si)
/* default chk_rcv function for scheduled tasks */ /* default chk_rcv function for scheduled tasks */
static void stream_int_chk_rcv(struct stream_interface *si) static void stream_int_chk_rcv(struct stream_interface *si)
{ {
struct channel *ib = si->ib; struct channel *ib = si_ic(si);
DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n", DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n",
__FUNCTION__, __FUNCTION__,
si, si->state, si->ib->flags, si->ob->flags); si, si->state, si_ic(si)->flags, si_oc(si)->flags);
if (unlikely(si->state != SI_ST_EST || (ib->flags & (CF_SHUTR|CF_DONT_READ)))) if (unlikely(si->state != SI_ST_EST || (ib->flags & (CF_SHUTR|CF_DONT_READ))))
return; return;
@ -330,13 +330,13 @@ static void stream_int_chk_rcv(struct stream_interface *si)
/* default chk_snd function for scheduled tasks */ /* default chk_snd function for scheduled tasks */
static void stream_int_chk_snd(struct stream_interface *si) static void stream_int_chk_snd(struct stream_interface *si)
{ {
struct channel *ob = si->ob; struct channel *ob = si_oc(si);
DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n", DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n",
__FUNCTION__, __FUNCTION__,
si, si->state, si->ib->flags, si->ob->flags); si, si->state, si_ic(si)->flags, si_oc(si)->flags);
if (unlikely(si->state != SI_ST_EST || (si->ob->flags & CF_SHUTW))) if (unlikely(si->state != SI_ST_EST || (si_oc(si)->flags & CF_SHUTW)))
return; return;
if (!(si->flags & SI_FL_WAIT_DATA) || /* not waiting for data */ if (!(si->flags & SI_FL_WAIT_DATA) || /* not waiting for data */
@ -424,7 +424,7 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag)
*/ */
if (conn->data == &si_conn_cb) { if (conn->data == &si_conn_cb) {
struct stream_interface *si = conn->owner; struct stream_interface *si = conn->owner;
struct connection *remote = objt_conn(si->ob->prod->end); struct connection *remote = objt_conn(si_oc(si)->prod->end);
ret = make_proxy_line(trash.str, trash.size, objt_server(conn->target), remote); ret = make_proxy_line(trash.str, trash.size, objt_server(conn->target), remote);
} }
else { else {
@ -550,7 +550,7 @@ static int si_conn_wake_cb(struct connection *conn)
DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n", DPRINTF(stderr, "%s: si=%p, si->state=%d ib->flags=%08x ob->flags=%08x\n",
__FUNCTION__, __FUNCTION__,
si, si->state, si->ib->flags, si->ob->flags); si, si->state, si_ic(si)->flags, si_oc(si)->flags);
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
si->flags |= SI_FL_ERR; si->flags |= SI_FL_ERR;
@ -558,36 +558,36 @@ static int si_conn_wake_cb(struct connection *conn)
/* check for recent connection establishment */ /* check for recent connection establishment */
if (unlikely(!(conn->flags & (CO_FL_WAIT_L4_CONN | CO_FL_WAIT_L6_CONN | CO_FL_CONNECTED)))) { if (unlikely(!(conn->flags & (CO_FL_WAIT_L4_CONN | CO_FL_WAIT_L6_CONN | CO_FL_CONNECTED)))) {
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
si->ob->flags |= CF_WRITE_NULL; si_oc(si)->flags |= CF_WRITE_NULL;
} }
/* process consumer side */ /* process consumer side */
if (channel_is_empty(si->ob)) { if (channel_is_empty(si_oc(si))) {
if (((si->ob->flags & (CF_SHUTW|CF_SHUTW_NOW)) == CF_SHUTW_NOW) && if (((si_oc(si)->flags & (CF_SHUTW|CF_SHUTW_NOW)) == CF_SHUTW_NOW) &&
(si->state == SI_ST_EST)) (si->state == SI_ST_EST))
stream_int_shutw_conn(si); stream_int_shutw_conn(si);
__conn_data_stop_send(conn); __conn_data_stop_send(conn);
si->ob->wex = TICK_ETERNITY; si_oc(si)->wex = TICK_ETERNITY;
} }
if ((si->ob->flags & (CF_SHUTW|CF_SHUTW_NOW)) == 0 && channel_may_recv(si->ob)) if ((si_oc(si)->flags & (CF_SHUTW|CF_SHUTW_NOW)) == 0 && channel_may_recv(si_oc(si)))
si->flags |= SI_FL_WAIT_DATA; si->flags |= SI_FL_WAIT_DATA;
if (si->ob->flags & CF_WRITE_ACTIVITY) { if (si_oc(si)->flags & CF_WRITE_ACTIVITY) {
/* update timeouts if we have written something */ /* update timeouts if we have written something */
if ((si->ob->flags & (CF_SHUTW|CF_WRITE_PARTIAL)) == CF_WRITE_PARTIAL && if ((si_oc(si)->flags & (CF_SHUTW|CF_WRITE_PARTIAL)) == CF_WRITE_PARTIAL &&
!channel_is_empty(si->ob)) !channel_is_empty(si_oc(si)))
if (tick_isset(si->ob->wex)) if (tick_isset(si_oc(si)->wex))
si->ob->wex = tick_add_ifset(now_ms, si->ob->wto); si_oc(si)->wex = tick_add_ifset(now_ms, si_oc(si)->wto);
if (!(si->flags & SI_FL_INDEP_STR)) if (!(si->flags & SI_FL_INDEP_STR))
if (tick_isset(si->ib->rex)) if (tick_isset(si_ic(si)->rex))
si->ib->rex = tick_add_ifset(now_ms, si->ib->rto); si_ic(si)->rex = tick_add_ifset(now_ms, si_ic(si)->rto);
if (likely((si->ob->flags & (CF_SHUTW|CF_WRITE_PARTIAL|CF_DONT_READ)) == CF_WRITE_PARTIAL && if (likely((si_oc(si)->flags & (CF_SHUTW|CF_WRITE_PARTIAL|CF_DONT_READ)) == CF_WRITE_PARTIAL &&
channel_may_recv(si->ob) && channel_may_recv(si_oc(si)) &&
(si->ob->prod->flags & SI_FL_WAIT_ROOM))) (si_oc(si)->prod->flags & SI_FL_WAIT_ROOM)))
si_chk_rcv(si->ob->prod); si_chk_rcv(si_oc(si)->prod);
} }
/* process producer side. /* process producer side.
@ -597,52 +597,52 @@ static int si_conn_wake_cb(struct connection *conn)
* immediately afterwards once the following data is parsed (eg: * immediately afterwards once the following data is parsed (eg:
* HTTP chunking). * HTTP chunking).
*/ */
if (((si->ib->flags & CF_READ_PARTIAL) && !channel_is_empty(si->ib)) && if (((si_ic(si)->flags & CF_READ_PARTIAL) && !channel_is_empty(si_ic(si))) &&
(si->ib->pipe /* always try to send spliced data */ || (si_ic(si)->pipe /* always try to send spliced data */ ||
(si->ib->buf->i == 0 && (si->ib->cons->flags & SI_FL_WAIT_DATA)))) { (si_ic(si)->buf->i == 0 && (si_ic(si)->cons->flags & SI_FL_WAIT_DATA)))) {
int last_len = si->ib->pipe ? si->ib->pipe->data : 0; int last_len = si_ic(si)->pipe ? si_ic(si)->pipe->data : 0;
si_chk_snd(si->ib->cons); si_chk_snd(si_ic(si)->cons);
/* check if the consumer has freed some space either in the /* check if the consumer has freed some space either in the
* buffer or in the pipe. * buffer or in the pipe.
*/ */
if (channel_may_recv(si->ib) && if (channel_may_recv(si_ic(si)) &&
(!last_len || !si->ib->pipe || si->ib->pipe->data < last_len)) (!last_len || !si_ic(si)->pipe || si_ic(si)->pipe->data < last_len))
si->flags &= ~SI_FL_WAIT_ROOM; si->flags &= ~SI_FL_WAIT_ROOM;
} }
if (si->flags & SI_FL_WAIT_ROOM) { if (si->flags & SI_FL_WAIT_ROOM) {
__conn_data_stop_recv(conn); __conn_data_stop_recv(conn);
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
} }
else if ((si->ib->flags & (CF_SHUTR|CF_READ_PARTIAL|CF_DONT_READ)) == CF_READ_PARTIAL && else if ((si_ic(si)->flags & (CF_SHUTR|CF_READ_PARTIAL|CF_DONT_READ)) == CF_READ_PARTIAL &&
channel_may_recv(si->ib)) { channel_may_recv(si_ic(si))) {
/* we must re-enable reading if si_chk_snd() has freed some space */ /* we must re-enable reading if si_chk_snd() has freed some space */
__conn_data_want_recv(conn); __conn_data_want_recv(conn);
if (!(si->ib->flags & CF_READ_NOEXP) && tick_isset(si->ib->rex)) if (!(si_ic(si)->flags & CF_READ_NOEXP) && tick_isset(si_ic(si)->rex))
si->ib->rex = tick_add_ifset(now_ms, si->ib->rto); si_ic(si)->rex = tick_add_ifset(now_ms, si_ic(si)->rto);
} }
/* wake the task up only when needed */ /* wake the task up only when needed */
if (/* changes on the production side */ if (/* changes on the production side */
(si->ib->flags & (CF_READ_NULL|CF_READ_ERROR)) || (si_ic(si)->flags & (CF_READ_NULL|CF_READ_ERROR)) ||
si->state != SI_ST_EST || si->state != SI_ST_EST ||
(si->flags & SI_FL_ERR) || (si->flags & SI_FL_ERR) ||
((si->ib->flags & CF_READ_PARTIAL) && ((si_ic(si)->flags & CF_READ_PARTIAL) &&
(!si->ib->to_forward || si->ib->cons->state != SI_ST_EST)) || (!si_ic(si)->to_forward || si_ic(si)->cons->state != SI_ST_EST)) ||
/* changes on the consumption side */ /* changes on the consumption side */
(si->ob->flags & (CF_WRITE_NULL|CF_WRITE_ERROR)) || (si_oc(si)->flags & (CF_WRITE_NULL|CF_WRITE_ERROR)) ||
((si->ob->flags & CF_WRITE_ACTIVITY) && ((si_oc(si)->flags & CF_WRITE_ACTIVITY) &&
((si->ob->flags & CF_SHUTW) || ((si_oc(si)->flags & CF_SHUTW) ||
((si->ob->flags & CF_WAKE_WRITE) && ((si_oc(si)->flags & CF_WAKE_WRITE) &&
(si->ob->prod->state != SI_ST_EST || (si_oc(si)->prod->state != SI_ST_EST ||
(channel_is_empty(si->ob) && !si->ob->to_forward)))))) { (channel_is_empty(si_oc(si)) && !si_oc(si)->to_forward)))))) {
task_wakeup(si->owner, TASK_WOKEN_IO); task_wakeup(si->owner, TASK_WOKEN_IO);
} }
if (si->ib->flags & CF_READ_ACTIVITY) if (si_ic(si)->flags & CF_READ_ACTIVITY)
si->ib->flags &= ~CF_READ_DONTWAIT; si_ic(si)->flags &= ~CF_READ_DONTWAIT;
session_release_buffers(si_sess(si)); session_release_buffers(si_sess(si));
return 0; return 0;
@ -657,7 +657,7 @@ static int si_conn_wake_cb(struct connection *conn)
static void si_conn_send(struct connection *conn) static void si_conn_send(struct connection *conn)
{ {
struct stream_interface *si = conn->owner; struct stream_interface *si = conn->owner;
struct channel *chn = si->ob; struct channel *chn = si_oc(si);
int ret; int ret;
if (chn->pipe && conn->xprt->snd_pipe) { if (chn->pipe && conn->xprt->snd_pipe) {
@ -733,8 +733,8 @@ static void si_conn_send(struct connection *conn)
*/ */
void stream_int_update_conn(struct stream_interface *si) void stream_int_update_conn(struct stream_interface *si)
{ {
struct channel *ib = si->ib; struct channel *ib = si_ic(si);
struct channel *ob = si->ob; struct channel *ob = si_oc(si);
struct connection *conn = __objt_conn(si->end); struct connection *conn = __objt_conn(si->end);
/* Check if we need to close the read side */ /* Check if we need to close the read side */
@ -812,17 +812,17 @@ static void stream_int_shutr_conn(struct stream_interface *si)
{ {
struct connection *conn = __objt_conn(si->end); struct connection *conn = __objt_conn(si->end);
si->ib->flags &= ~CF_SHUTR_NOW; si_ic(si)->flags &= ~CF_SHUTR_NOW;
if (si->ib->flags & CF_SHUTR) if (si_ic(si)->flags & CF_SHUTR)
return; return;
si->ib->flags |= CF_SHUTR; si_ic(si)->flags |= CF_SHUTR;
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->flags &= ~SI_FL_WAIT_ROOM; si->flags &= ~SI_FL_WAIT_ROOM;
if (si->state != SI_ST_EST && si->state != SI_ST_CON) if (si->state != SI_ST_EST && si->state != SI_ST_CON)
return; return;
if (si->ob->flags & CF_SHUTW) { if (si_oc(si)->flags & CF_SHUTW) {
conn_full_close(conn); conn_full_close(conn);
si->state = SI_ST_DIS; si->state = SI_ST_DIS;
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
@ -854,11 +854,11 @@ static void stream_int_shutw_conn(struct stream_interface *si)
{ {
struct connection *conn = __objt_conn(si->end); struct connection *conn = __objt_conn(si->end);
si->ob->flags &= ~CF_SHUTW_NOW; si_oc(si)->flags &= ~CF_SHUTW_NOW;
if (si->ob->flags & CF_SHUTW) if (si_oc(si)->flags & CF_SHUTW)
return; return;
si->ob->flags |= CF_SHUTW; si_oc(si)->flags |= CF_SHUTW;
si->ob->wex = TICK_ETERNITY; si_oc(si)->wex = TICK_ETERNITY;
si->flags &= ~SI_FL_WAIT_DATA; si->flags &= ~SI_FL_WAIT_DATA;
switch (si->state) { switch (si->state) {
@ -888,12 +888,12 @@ static void stream_int_shutw_conn(struct stream_interface *si)
* closed write with pending read (eg: abortonclose while * closed write with pending read (eg: abortonclose while
* waiting for the server). * waiting for the server).
*/ */
if (!(si->flags & SI_FL_NOHALF) || !(si->ib->flags & (CF_SHUTR|CF_DONT_READ))) { if (!(si->flags & SI_FL_NOHALF) || !(si_ic(si)->flags & (CF_SHUTR|CF_DONT_READ))) {
/* We shutdown transport layer */ /* We shutdown transport layer */
if (conn_ctrl_ready(conn)) if (conn_ctrl_ready(conn))
shutdown(conn->t.sock.fd, SHUT_WR); shutdown(conn->t.sock.fd, SHUT_WR);
if (!(si->ib->flags & (CF_SHUTR|CF_DONT_READ))) { if (!(si_ic(si)->flags & (CF_SHUTR|CF_DONT_READ))) {
/* OK just a shutw, but we want the caller /* OK just a shutw, but we want the caller
* to disable polling on this FD if exists. * to disable polling on this FD if exists.
*/ */
@ -918,9 +918,9 @@ static void stream_int_shutw_conn(struct stream_interface *si)
/* fall through */ /* fall through */
default: default:
si->flags &= ~(SI_FL_WAIT_ROOM | SI_FL_NOLINGER); si->flags &= ~(SI_FL_WAIT_ROOM | SI_FL_NOLINGER);
si->ib->flags &= ~CF_SHUTR_NOW; si_ic(si)->flags &= ~CF_SHUTR_NOW;
si->ib->flags |= CF_SHUTR; si_ic(si)->flags |= CF_SHUTR;
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
} }
} }
@ -933,7 +933,7 @@ static void stream_int_shutw_conn(struct stream_interface *si)
*/ */
static void stream_int_chk_rcv_conn(struct stream_interface *si) static void stream_int_chk_rcv_conn(struct stream_interface *si)
{ {
struct channel *ib = si->ib; struct channel *ib = si_ic(si);
struct connection *conn = __objt_conn(si->end); struct connection *conn = __objt_conn(si->end);
if (unlikely(si->state > SI_ST_EST || (ib->flags & CF_SHUTR))) if (unlikely(si->state > SI_ST_EST || (ib->flags & CF_SHUTR)))
@ -963,7 +963,7 @@ static void stream_int_chk_rcv_conn(struct stream_interface *si)
*/ */
static void stream_int_chk_snd_conn(struct stream_interface *si) static void stream_int_chk_snd_conn(struct stream_interface *si)
{ {
struct channel *ob = si->ob; struct channel *ob = si_oc(si);
struct connection *conn = __objt_conn(si->end); struct connection *conn = __objt_conn(si->end);
if (unlikely(si->state > SI_ST_EST || (ob->flags & CF_SHUTW))) if (unlikely(si->state > SI_ST_EST || (ob->flags & CF_SHUTW)))
@ -1037,7 +1037,7 @@ static void stream_int_chk_snd_conn(struct stream_interface *si)
!channel_is_empty(ob)) !channel_is_empty(ob))
ob->wex = tick_add_ifset(now_ms, ob->wto); ob->wex = tick_add_ifset(now_ms, ob->wto);
if (tick_isset(si->ib->rex) && !(si->flags & SI_FL_INDEP_STR)) { if (tick_isset(si_ic(si)->rex) && !(si->flags & SI_FL_INDEP_STR)) {
/* Note: to prevent the client from expiring read timeouts /* Note: to prevent the client from expiring read timeouts
* during writes, we refresh it. We only do this if the * during writes, we refresh it. We only do this if the
* interface is not configured for "independent streams", * interface is not configured for "independent streams",
@ -1046,7 +1046,7 @@ static void stream_int_chk_snd_conn(struct stream_interface *si)
* of data which can full the socket buffers long before a * of data which can full the socket buffers long before a
* write timeout is detected. * write timeout is detected.
*/ */
si->ib->rex = tick_add_ifset(now_ms, si->ib->rto); si_ic(si)->rex = tick_add_ifset(now_ms, si_ic(si)->rto);
} }
} }
@ -1055,7 +1055,7 @@ static void stream_int_chk_snd_conn(struct stream_interface *si)
*/ */
if (likely((ob->flags & (CF_WRITE_NULL|CF_WRITE_ERROR|CF_SHUTW)) || if (likely((ob->flags & (CF_WRITE_NULL|CF_WRITE_ERROR|CF_SHUTW)) ||
((ob->flags & CF_WAKE_WRITE) && ((ob->flags & CF_WAKE_WRITE) &&
((channel_is_empty(si->ob) && !ob->to_forward) || ((channel_is_empty(si_oc(si)) && !ob->to_forward) ||
si->state != SI_ST_EST)))) { si->state != SI_ST_EST)))) {
out_wakeup: out_wakeup:
if (!(si->flags & SI_FL_DONT_WAKE) && si->owner) if (!(si->flags & SI_FL_DONT_WAKE) && si->owner)
@ -1074,7 +1074,7 @@ static void stream_int_chk_snd_conn(struct stream_interface *si)
static void si_conn_recv_cb(struct connection *conn) static void si_conn_recv_cb(struct connection *conn)
{ {
struct stream_interface *si = conn->owner; struct stream_interface *si = conn->owner;
struct channel *chn = si->ib; struct channel *chn = si_ic(si);
int ret, max, cur_read; int ret, max, cur_read;
int read_poll = MAX_READ_POLL_LOOPS; int read_poll = MAX_READ_POLL_LOOPS;
@ -1306,7 +1306,7 @@ static void si_conn_recv_cb(struct connection *conn)
static void si_conn_send_cb(struct connection *conn) static void si_conn_send_cb(struct connection *conn)
{ {
struct stream_interface *si = conn->owner; struct stream_interface *si = conn->owner;
struct channel *chn = si->ob; struct channel *chn = si_oc(si);
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
return; return;
@ -1337,17 +1337,17 @@ void stream_sock_read0(struct stream_interface *si)
{ {
struct connection *conn = __objt_conn(si->end); struct connection *conn = __objt_conn(si->end);
si->ib->flags &= ~CF_SHUTR_NOW; si_ic(si)->flags &= ~CF_SHUTR_NOW;
if (si->ib->flags & CF_SHUTR) if (si_ic(si)->flags & CF_SHUTR)
return; return;
si->ib->flags |= CF_SHUTR; si_ic(si)->flags |= CF_SHUTR;
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->flags &= ~SI_FL_WAIT_ROOM; si->flags &= ~SI_FL_WAIT_ROOM;
if (si->state != SI_ST_EST && si->state != SI_ST_CON) if (si->state != SI_ST_EST && si->state != SI_ST_CON)
return; return;
if (si->ob->flags & CF_SHUTW) if (si_oc(si)->flags & CF_SHUTW)
goto do_close; goto do_close;
if (si->flags & SI_FL_NOHALF) { if (si->flags & SI_FL_NOHALF) {
@ -1368,13 +1368,13 @@ void stream_sock_read0(struct stream_interface *si)
/* OK we completely close the socket here just as if we went through si_shut[rw]() */ /* OK we completely close the socket here just as if we went through si_shut[rw]() */
conn_full_close(conn); conn_full_close(conn);
si->ib->flags &= ~CF_SHUTR_NOW; si_ic(si)->flags &= ~CF_SHUTR_NOW;
si->ib->flags |= CF_SHUTR; si_ic(si)->flags |= CF_SHUTR;
si->ib->rex = TICK_ETERNITY; si_ic(si)->rex = TICK_ETERNITY;
si->ob->flags &= ~CF_SHUTW_NOW; si_oc(si)->flags &= ~CF_SHUTW_NOW;
si->ob->flags |= CF_SHUTW; si_oc(si)->flags |= CF_SHUTW;
si->ob->wex = TICK_ETERNITY; si_oc(si)->wex = TICK_ETERNITY;
si->flags &= ~(SI_FL_WAIT_DATA | SI_FL_WAIT_ROOM); si->flags &= ~(SI_FL_WAIT_DATA | SI_FL_WAIT_ROOM);