REORG: stream_interface: create a struct sock_ops to hold socket operations
These operators are used regardless of the socket protocol family. Move
them to a "sock_ops" struct. ->read and ->write have been moved there too
as they have no reason to remain at the protocol level.
diff --git a/src/dumpstats.c b/src/dumpstats.c
index cddbc3e..465844f 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -1376,7 +1376,7 @@
/* Let's close for real now. We just close the request
* side, the conditions below will complete if needed.
*/
- si->shutw(si);
+ si->sock.shutw(si);
break;
}
else if (si->applet.st0 == STAT_CLI_GETREQ) {
@@ -1518,7 +1518,7 @@
* we forward the close to the request side so that it flows upstream to
* the client.
*/
- si->shutw(si);
+ si->sock.shutw(si);
}
if ((req->flags & BF_SHUTW) && (si->state == SI_ST_EST) && (si->applet.st0 < STAT_CLI_OUTPUT)) {
@@ -1528,12 +1528,12 @@
* the client side has closed. So we'll forward this state downstream
* on the response buffer.
*/
- si->shutr(si);
+ si->sock.shutr(si);
res->flags |= BF_READ_NULL;
}
/* update all other flags and resync with the other side */
- si->update(si);
+ si->sock.update(si);
/* we don't want to expire timeouts while we're processing requests */
si->ib->rex = TICK_ETERNITY;
@@ -1735,26 +1735,26 @@
if (s->txn.meth == HTTP_METH_POST) {
if (stats_http_redir(si, s->be->uri_auth)) {
si->applet.st0 = 1;
- si->shutw(si);
+ si->sock.shutw(si);
}
} else {
if (stats_dump_http(si, s->be->uri_auth)) {
si->applet.st0 = 1;
- si->shutw(si);
+ si->sock.shutw(si);
}
}
}
if ((res->flags & BF_SHUTR) && (si->state == SI_ST_EST))
- si->shutw(si);
+ si->sock.shutw(si);
if ((req->flags & BF_SHUTW) && (si->state == SI_ST_EST) && si->applet.st0) {
- si->shutr(si);
+ si->sock.shutr(si);
res->flags |= BF_READ_NULL;
}
/* update all other flags and resync with the other side */
- si->update(si);
+ si->sock.update(si);
/* we don't want to expire timeouts while we're processing requests */
si->ib->rex = TICK_ETERNITY;
diff --git a/src/peers.c b/src/peers.c
index ab6f7ed..8c8795a 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -1023,15 +1023,15 @@
si->applet.st0 = PEER_SESSION_END;
/* fall through */
case PEER_SESSION_END: {
- si->shutw(si);
- si->shutr(si);
+ si->sock.shutw(si);
+ si->sock.shutr(si);
si->ib->flags |= BF_READ_NULL;
goto quit;
}
}
}
out:
- si->update(si);
+ si->sock.update(si);
si->ob->flags |= BF_READ_DONTWAIT;
/* we don't want to expire timeouts while we're processing requests */
si->ib->rex = TICK_ETERNITY;
diff --git a/src/proto_http.c b/src/proto_http.c
index 0fffad4..2c1ff56 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -803,8 +803,8 @@
}
/* prepare to return without error. */
- si->shutr(si);
- si->shutw(si);
+ si->sock.shutr(si);
+ si->sock.shutw(si);
si->err_type = SI_ET_NONE;
si->err_loc = NULL;
si->state = SI_ST_CLO;
@@ -3713,8 +3713,8 @@
http_silent_debug(__LINE__, s);
s->req->cons->flags |= SI_FL_NOLINGER;
- s->req->cons->shutr(s->req->cons);
- s->req->cons->shutw(s->req->cons);
+ s->req->cons->sock.shutr(s->req->cons);
+ s->req->cons->sock.shutw(s->req->cons);
http_silent_debug(__LINE__, s);
diff --git a/src/session.c b/src/session.c
index f8b6516..fabba1f 100644
--- a/src/session.c
+++ b/src/session.c
@@ -200,8 +200,8 @@
s->si[1].get_src = NULL;
s->si[1].get_dst = NULL;
clear_target(&s->si[1].target);
- s->si[1].shutr = stream_int_shutr;
- s->si[1].shutw = stream_int_shutw;
+ s->si[1].sock.shutr= stream_int_shutr;
+ s->si[1].sock.shutw= stream_int_shutw;
s->si[1].exp = TICK_ETERNITY;
s->si[1].flags = SI_FL_NONE;
@@ -573,7 +573,7 @@
(((req->flags & (BF_OUT_EMPTY|BF_WRITE_ACTIVITY)) == BF_OUT_EMPTY) ||
s->be->options & PR_O_ABRT_CLOSE)))) {
/* give up */
- si->shutw(si);
+ si->sock.shutw(si);
si->err_type |= SI_ET_CONN_ABRT;
si->err_loc = target_srv(&s->target);
si->flags &= ~SI_FL_CAP_SPLICE;
@@ -634,7 +634,7 @@
process_srv_queue(target_srv(&s->target));
/* shutw is enough so stop a connecting socket */
- si->shutw(si);
+ si->sock.shutw(si);
si->ob->flags |= BF_WRITE_ERROR;
si->ib->flags |= BF_READ_ERROR;
@@ -773,8 +773,8 @@
process_srv_queue(srv);
/* Failed and not retryable. */
- si->shutr(si);
- si->shutw(si);
+ si->sock.shutr(si);
+ si->sock.shutw(si);
si->ob->flags |= BF_WRITE_ERROR;
s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
@@ -822,8 +822,8 @@
if (srv)
srv->counters.failed_conns++;
s->be->be_counters.failed_conns++;
- si->shutr(si);
- si->shutw(si);
+ si->sock.shutr(si);
+ si->sock.shutw(si);
si->ob->flags |= BF_WRITE_TIMEOUT;
if (!si->err_type)
si->err_type = SI_ET_QUEUE_TO;
@@ -840,8 +840,8 @@
/* give up */
si->exp = TICK_ETERNITY;
s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
- si->shutr(si);
- si->shutw(si);
+ si->sock.shutr(si);
+ si->sock.shutw(si);
si->err_type |= SI_ET_QUEUE_ABRT;
si->state = SI_ST_CLO;
if (s->srv_error)
@@ -859,8 +859,8 @@
(si->ob->flags & BF_OUT_EMPTY || s->be->options & PR_O_ABRT_CLOSE))) {
/* give up */
si->exp = TICK_ETERNITY;
- si->shutr(si);
- si->shutw(si);
+ si->sock.shutr(si);
+ si->sock.shutw(si);
si->err_type |= SI_ET_CONN_ABRT;
si->state = SI_ST_CLO;
if (s->srv_error)
@@ -938,8 +938,8 @@
return;
/* we did not get any server, let's check the cause */
- si->shutr(si);
- si->shutw(si);
+ si->sock.shutr(si);
+ si->sock.shutw(si);
si->ob->flags |= BF_WRITE_ERROR;
if (!si->err_type)
si->err_type = SI_ET_CONN_OTHER;
@@ -1352,21 +1352,21 @@
if (unlikely((s->req->flags & (BF_SHUTW|BF_WRITE_TIMEOUT)) == BF_WRITE_TIMEOUT)) {
s->req->cons->flags |= SI_FL_NOLINGER;
- s->req->cons->shutw(s->req->cons);
+ s->req->cons->sock.shutw(s->req->cons);
}
if (unlikely((s->req->flags & (BF_SHUTR|BF_READ_TIMEOUT)) == BF_READ_TIMEOUT))
- s->req->prod->shutr(s->req->prod);
+ s->req->prod->sock.shutr(s->req->prod);
buffer_check_timeouts(s->rep);
if (unlikely((s->rep->flags & (BF_SHUTW|BF_WRITE_TIMEOUT)) == BF_WRITE_TIMEOUT)) {
s->rep->cons->flags |= SI_FL_NOLINGER;
- s->rep->cons->shutw(s->rep->cons);
+ s->rep->cons->sock.shutw(s->rep->cons);
}
if (unlikely((s->rep->flags & (BF_SHUTR|BF_READ_TIMEOUT)) == BF_READ_TIMEOUT))
- s->rep->prod->shutr(s->rep->prod);
+ s->rep->prod->sock.shutr(s->rep->prod);
}
/* 1b: check for low-level errors reported at the stream interface.
@@ -1379,8 +1379,8 @@
srv = target_srv(&s->target);
if (unlikely(s->si[0].flags & SI_FL_ERR)) {
if (s->si[0].state == SI_ST_EST || s->si[0].state == SI_ST_DIS) {
- s->si[0].shutr(&s->si[0]);
- s->si[0].shutw(&s->si[0]);
+ s->si[0].sock.shutr(&s->si[0]);
+ s->si[0].sock.shutw(&s->si[0]);
stream_int_report_error(&s->si[0]);
if (!(s->req->analysers) && !(s->rep->analysers)) {
s->be->be_counters.cli_aborts++;
@@ -1397,8 +1397,8 @@
if (unlikely(s->si[1].flags & SI_FL_ERR)) {
if (s->si[1].state == SI_ST_EST || s->si[1].state == SI_ST_DIS) {
- s->si[1].shutr(&s->si[1]);
- s->si[1].shutw(&s->si[1]);
+ s->si[1].sock.shutr(&s->si[1]);
+ s->si[1].sock.shutw(&s->si[1]);
stream_int_report_error(&s->si[1]);
s->be->be_counters.failed_resp++;
if (srv)
@@ -1895,7 +1895,7 @@
/* shutdown(write) pending */
if (unlikely((s->req->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_OUT_EMPTY)) == (BF_SHUTW_NOW|BF_OUT_EMPTY)))
- s->req->cons->shutw(s->req->cons);
+ s->req->cons->sock.shutw(s->req->cons);
/* shutdown(write) done on server side, we must stop the client too */
if (unlikely((s->req->flags & (BF_SHUTW|BF_SHUTR|BF_SHUTR_NOW)) == BF_SHUTW &&
@@ -1904,7 +1904,7 @@
/* shutdown(read) pending */
if (unlikely((s->req->flags & (BF_SHUTR|BF_SHUTR_NOW)) == BF_SHUTR_NOW))
- s->req->prod->shutr(s->req->prod);
+ s->req->prod->sock.shutr(s->req->prod);
/* it's possible that an upper layer has requested a connection setup or abort.
* There are 2 situations where we decide to establish a new connection :
@@ -2026,7 +2026,7 @@
/* shutdown(write) pending */
if (unlikely((s->rep->flags & (BF_SHUTW|BF_OUT_EMPTY|BF_SHUTW_NOW)) == (BF_OUT_EMPTY|BF_SHUTW_NOW)))
- s->rep->cons->shutw(s->rep->cons);
+ s->rep->cons->sock.shutw(s->rep->cons);
/* shutdown(write) done on the client side, we must stop the server too */
if (unlikely((s->rep->flags & (BF_SHUTW|BF_SHUTR|BF_SHUTR_NOW)) == BF_SHUTW) &&
@@ -2035,7 +2035,7 @@
/* shutdown(read) pending */
if (unlikely((s->rep->flags & (BF_SHUTR|BF_SHUTR_NOW)) == BF_SHUTR_NOW))
- s->rep->prod->shutr(s->rep->prod);
+ s->rep->prod->sock.shutr(s->rep->prod);
if (s->req->prod->state == SI_ST_DIS || s->req->cons->state == SI_ST_DIS)
goto resync_stream_interface;
@@ -2086,10 +2086,10 @@
session_process_counters(s);
if (s->rep->cons->state == SI_ST_EST && s->rep->cons->target.type != TARG_TYPE_APPLET)
- s->rep->cons->update(s->rep->cons);
+ s->rep->cons->sock.update(s->rep->cons);
if (s->req->cons->state == SI_ST_EST && s->req->cons->target.type != TARG_TYPE_APPLET)
- s->req->cons->update(s->req->cons);
+ s->req->cons->sock.update(s->req->cons);
s->req->flags &= ~(BF_READ_NULL|BF_READ_PARTIAL|BF_WRITE_NULL|BF_WRITE_PARTIAL|BF_READ_ATTACHED);
s->rep->flags &= ~(BF_READ_NULL|BF_READ_PARTIAL|BF_WRITE_NULL|BF_WRITE_PARTIAL|BF_READ_ATTACHED);
diff --git a/src/stream_interface.c b/src/stream_interface.c
index cea1a19..2097623 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -108,7 +108,7 @@
return;
if ((si->ob->flags & (BF_OUT_EMPTY|BF_SHUTW|BF_HIJACK|BF_SHUTW_NOW)) == (BF_OUT_EMPTY|BF_SHUTW_NOW))
- si->shutw(si);
+ si->sock.shutw(si);
if ((si->ob->flags & (BF_FULL|BF_SHUTW|BF_SHUTW_NOW|BF_HIJACK)) == 0)
si->flags |= SI_FL_WAIT_DATA;
@@ -134,11 +134,11 @@
old_flags = si->flags;
if (likely((si->ob->flags & (BF_SHUTW|BF_WRITE_PARTIAL|BF_FULL|BF_DONT_READ)) == BF_WRITE_PARTIAL &&
(si->ob->prod->flags & SI_FL_WAIT_ROOM)))
- si->ob->prod->chk_rcv(si->ob->prod);
+ si->ob->prod->sock.chk_rcv(si->ob->prod);
if (((si->ib->flags & (BF_READ_PARTIAL|BF_OUT_EMPTY)) == BF_READ_PARTIAL) &&
(si->ib->cons->flags & SI_FL_WAIT_DATA)) {
- si->ib->cons->chk_snd(si->ib->cons);
+ si->ib->cons->sock.chk_snd(si->ib->cons);
/* check if the consumer has freed some space */
if (!(si->ib->flags & BF_FULL))
si->flags &= ~SI_FL_WAIT_ROOM;
@@ -308,11 +308,11 @@
{
DPRINTF(stderr, "registering handler %p for si %p (was %p)\n", app, si, si->owner);
- si->update = stream_int_update_embedded;
- si->shutr = stream_int_shutr;
- si->shutw = stream_int_shutw;
- si->chk_rcv = stream_int_chk_rcv;
- si->chk_snd = stream_int_chk_snd;
+ si->sock.update = stream_int_update_embedded;
+ si->sock.shutr = stream_int_shutr;
+ si->sock.shutw = stream_int_shutw;
+ si->sock.chk_rcv = stream_int_chk_rcv;
+ si->sock.chk_snd = stream_int_chk_snd;
si->connect = NULL;
set_target_applet(&si->target, app);
si->applet.state = 0;
@@ -335,11 +335,11 @@
DPRINTF(stderr, "registering handler %p for si %p (was %p)\n", fct, si, si->owner);
- si->update = stream_int_update;
- si->shutr = stream_int_shutr;
- si->shutw = stream_int_shutw;
- si->chk_rcv = stream_int_chk_rcv;
- si->chk_snd = stream_int_chk_snd;
+ si->sock.update = stream_int_update;
+ si->sock.shutr = stream_int_shutr;
+ si->sock.shutw = stream_int_shutw;
+ si->sock.chk_rcv = stream_int_chk_rcv;
+ si->sock.chk_snd = stream_int_chk_snd;
si->connect = NULL;
clear_target(&si->target);
si->release = NULL;
diff --git a/src/stream_sock.c b/src/stream_sock.c
index 1b543d0..3862ac8 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -94,7 +94,7 @@
si->flags |= SI_FL_WAIT_ROOM;
EV_FD_CLR(fd, DIR_RD);
b->rex = TICK_ETERNITY;
- b->cons->chk_snd(b->cons);
+ b->cons->sock.chk_snd(b->cons);
return 1;
}
@@ -443,7 +443,7 @@
(b->i == 0 && (b->cons->flags & SI_FL_WAIT_DATA))) {
int last_len = b->pipe ? b->pipe->data : 0;
- b->cons->chk_snd(b->cons);
+ b->cons->sock.chk_snd(b->cons);
/* check if the consumer has freed some space */
if (!(b->flags & BF_FULL) &&
@@ -790,7 +790,7 @@
/* the producer might be waiting for more room to store data */
if (likely((b->flags & (BF_SHUTW|BF_WRITE_PARTIAL|BF_FULL|BF_DONT_READ)) == BF_WRITE_PARTIAL &&
(b->prod->flags & SI_FL_WAIT_ROOM)))
- b->prod->chk_rcv(b->prod);
+ b->prod->sock.chk_rcv(b->prod);
/* we have to wake up if there is a special event or if we don't have
* any more data to forward and it's not planned to send any more.
@@ -1300,11 +1300,11 @@
/* Prepare a stream interface to be used in socket mode. */
void stream_sock_prepare_interface(struct stream_interface *si)
{
- si->update = stream_sock_data_finish;
- si->shutr = stream_sock_shutr;
- si->shutw = stream_sock_shutw;
- si->chk_rcv = stream_sock_chk_rcv;
- si->chk_snd = stream_sock_chk_snd;
+ si->sock.update = stream_sock_data_finish;
+ si->sock.shutr = stream_sock_shutr;
+ si->sock.shutw = stream_sock_shutw;
+ si->sock.chk_rcv = stream_sock_chk_rcv;
+ si->sock.chk_snd = stream_sock_chk_snd;
}