REORG: connection: rename the data layer the "transport layer"
While working on the changes required to make the health checks use the
new connections, it started to become obvious that some naming was not
logical at all in the connections. Specifically, it is not logical to
call the "data layer" the layer which is in charge for all the handshake
and which does not yet provide a data layer once established until a
session has allocated all the required buffers.
In fact, it's more a transport layer, which makes much more sense. The
transport layer offers a medium on which data can transit, and it offers
the functions to move these data when the upper layer requests this. And
it is the upper layer which iterates over the transport layer's functions
to move data which should be called the data layer.
The use case where it's obvious is with embryonic sessions : an incoming
SSL connection is accepted. Only the connection is allocated, not the
buffers nor stream interface, etc... The connection handles the SSL
handshake by itself. Once this handshake is complete, we can't use the
data functions because the buffers and stream interface are not there
yet. Hence we have to first call a specific function to complete the
session initialization, after which we'll be able to use the data
functions. This clearly proves that SSL here is only a transport layer
and that the stream interface constitutes the data layer.
A similar change will be performed to rename app_cb => data, but the
two could not be in the same commit for obvious reasons.
diff --git a/src/backend.c b/src/backend.c
index a6c0010..bae62b5 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -985,7 +985,7 @@
/* set the correct protocol on the output stream interface */
if (s->target.type == TARG_TYPE_SERVER) {
- si_prepare_conn(s->req->cons, target_srv(&s->target)->proto, target_srv(&s->target)->data);
+ si_prepare_conn(s->req->cons, target_srv(&s->target)->proto, target_srv(&s->target)->xprt);
}
else if (s->target.type == TARG_TYPE_PROXY) {
/* proxies exclusively run on raw_sock right now */
diff --git a/src/cfgparse.c b/src/cfgparse.c
index a3f9c96..af89219 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -270,7 +270,7 @@
l->fd = -1;
l->addr = ss;
- l->data = &raw_sock;
+ l->xprt = &raw_sock;
l->state = LI_INIT;
if (ss.ss_family == AF_INET) {
@@ -1306,7 +1306,7 @@
}
newpeer->addr = *sk;
newpeer->proto = protocol_by_family(newpeer->addr.ss_family);
- newpeer->data = &raw_sock;
+ newpeer->xprt = &raw_sock;
newpeer->sock_init_arg = NULL;
if (!newpeer->proto) {
@@ -3949,7 +3949,7 @@
}
newsrv->addr = *sk;
newsrv->proto = protocol_by_family(newsrv->addr.ss_family);
- newsrv->data = &raw_sock;
+ newsrv->xprt = &raw_sock;
if (!newsrv->proto) {
Alert("parsing [%s:%d] : Unknown protocol family %d '%s'\n",
@@ -6274,7 +6274,7 @@
/* Initiate SSL context for current server */
newsrv->ssl_ctx.reused_sess = NULL;
- newsrv->data = &ssl_sock;
+ newsrv->xprt = &ssl_sock;
newsrv->ssl_ctx.ctx = SSL_CTX_new(SSLv23_client_method());
if(!newsrv->ssl_ctx.ctx) {
diff --git a/src/dumpstats.c b/src/dumpstats.c
index 0776121..8fcca9c 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -126,7 +126,7 @@
/* we have a dedicated I/O handler for the stats */
stream_int_register_handler(&s->si[1], &cli_applet);
copy_target(&s->target, &s->si[1].conn.target); // for logging only
- s->si[1].conn.data_ctx = s;
+ s->si[1].conn.xprt_ctx = s;
s->si[1].applet.st1 = 0;
s->si[1].applet.st0 = STAT_CLI_INIT;
@@ -401,7 +401,7 @@
static int stats_dump_table_head_to_buffer(struct chunk *msg, struct stream_interface *si,
struct proxy *proxy, struct proxy *target)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
chunk_printf(msg, "# table: %s, type: %s, size:%d, used:%d\n",
proxy->id, stktable_types[proxy->table.type].kw, proxy->table.size, proxy->table.current);
@@ -490,7 +490,7 @@
static void stats_sock_table_key_request(struct stream_interface *si, char **args, int action)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
struct proxy *px = si->applet.ctx.table.target;
struct stksess *ts;
uint32_t uint32_key;
@@ -693,7 +693,7 @@
static void stats_sock_table_request(struct stream_interface *si, char **args, int action)
{
si->applet.ctx.table.data_type = -1;
- si->conn.data_st = STAT_ST_INIT;
+ si->conn.xprt_st = STAT_ST_INIT;
si->applet.ctx.table.target = NULL;
si->applet.ctx.table.proxy = NULL;
si->applet.ctx.table.entry = NULL;
@@ -819,7 +819,7 @@
*/
static int stats_sock_parse_request(struct stream_interface *si, char *line)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
char *args[MAX_STATS_ARGS + 1];
int arg;
@@ -858,17 +858,17 @@
si->applet.ctx.stats.flags |= STAT_SHOW_STAT;
si->applet.ctx.stats.flags |= STAT_FMT_CSV;
- si->conn.data_st = STAT_ST_INIT;
+ si->conn.xprt_st = STAT_ST_INIT;
si->applet.st0 = STAT_CLI_O_INFO; // stats_dump_raw_to_buffer
}
else if (strcmp(args[1], "info") == 0) {
si->applet.ctx.stats.flags |= STAT_SHOW_INFO;
si->applet.ctx.stats.flags |= STAT_FMT_CSV;
- si->conn.data_st = STAT_ST_INIT;
+ si->conn.xprt_st = STAT_ST_INIT;
si->applet.st0 = STAT_CLI_O_INFO; // stats_dump_raw_to_buffer
}
else if (strcmp(args[1], "sess") == 0) {
- si->conn.data_st = STAT_ST_INIT;
+ si->conn.xprt_st = STAT_ST_INIT;
if (s->listener->bind_conf->level < ACCESS_LVL_OPER) {
si->applet.ctx.cli.msg = stats_permission_denied_msg;
si->applet.st0 = STAT_CLI_PRINT;
@@ -893,7 +893,7 @@
else
si->applet.ctx.errors.iid = -1;
si->applet.ctx.errors.px = NULL;
- si->conn.data_st = STAT_ST_INIT;
+ si->conn.xprt_st = STAT_ST_INIT;
si->applet.st0 = STAT_CLI_O_ERR; // stats_dump_errors_to_buffer
}
else if (strcmp(args[1], "table") == 0) {
@@ -1627,7 +1627,7 @@
}
/* This function dumps statistics onto the stream interface's read buffer.
- * The data_ctx must have been zeroed first, and the flags properly set.
+ * The xprt_ctx must have been zeroed first, and the flags properly set.
* It returns 0 as long as it does not complete, non-zero upon completion.
* Some states are not used but it makes the code more similar to other
* functions which handle stats too.
@@ -1640,10 +1640,10 @@
chunk_init(&msg, trash, trashlen);
- switch (si->conn.data_st) {
+ switch (si->conn.xprt_st) {
case STAT_ST_INIT:
/* the function had not been called yet */
- si->conn.data_st = STAT_ST_HEAD;
+ si->conn.xprt_st = STAT_ST_HEAD;
/* fall through */
case STAT_ST_HEAD:
@@ -1653,7 +1653,7 @@
return 0;
}
- si->conn.data_st = STAT_ST_INFO;
+ si->conn.xprt_st = STAT_ST_INFO;
/* fall through */
case STAT_ST_INFO:
@@ -1706,7 +1706,7 @@
si->applet.ctx.stats.px = proxy;
si->applet.ctx.stats.px_st = STAT_PX_ST_INIT;
si->applet.ctx.stats.sv = NULL;
- si->conn.data_st = STAT_ST_LIST;
+ si->conn.xprt_st = STAT_ST_LIST;
/* fall through */
case STAT_ST_LIST:
@@ -1727,11 +1727,11 @@
/* here, we just have reached the last proxy */
}
- si->conn.data_st = STAT_ST_END;
+ si->conn.xprt_st = STAT_ST_END;
/* fall through */
case STAT_ST_END:
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
/* fall through */
case STAT_ST_FIN:
@@ -1739,7 +1739,7 @@
default:
/* unknown state ! */
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
return 1;
}
}
@@ -1751,12 +1751,12 @@
*/
static int stats_http_redir(struct stream_interface *si, struct uri_auth *uri)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
struct chunk msg;
chunk_init(&msg, trash, trashlen);
- switch (si->conn.data_st) {
+ switch (si->conn.xprt_st) {
case STAT_ST_INIT:
chunk_printf(&msg,
"HTTP/1.0 303 See Other\r\n"
@@ -1782,7 +1782,7 @@
if (!(s->flags & SN_FINST_MASK))
s->flags |= SN_FINST_R;
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
return 1;
}
return 1;
@@ -1796,7 +1796,7 @@
*/
static void http_stats_io_handler(struct stream_interface *si)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
struct channel *req = si->ob;
struct channel *res = si->ib;
@@ -1845,14 +1845,14 @@
/* This function dumps statistics in HTTP format onto the stream interface's
- * read buffer. The data_ctx must have been zeroed first, and the flags
+ * read buffer. The xprt_ctx must have been zeroed first, and the flags
* properly set. It returns 0 if it had to stop writing data and an I/O is
* needed, 1 if the dump is finished and the session must be closed, or -1
* in case of any error.
*/
static int stats_dump_http(struct stream_interface *si, struct uri_auth *uri)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
struct channel *rep = si->ib;
struct proxy *px;
struct chunk msg;
@@ -1860,7 +1860,7 @@
chunk_init(&msg, trash, trashlen);
- switch (si->conn.data_st) {
+ switch (si->conn.xprt_st) {
case STAT_ST_INIT:
chunk_printf(&msg,
"HTTP/1.0 200 OK\r\n"
@@ -1886,11 +1886,11 @@
if (s->txn.meth == HTTP_METH_HEAD) {
/* that's all we return in case of HEAD request */
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
return 1;
}
- si->conn.data_st = STAT_ST_HEAD; /* let's start producing data */
+ si->conn.xprt_st = STAT_ST_HEAD; /* let's start producing data */
/* fall through */
case STAT_ST_HEAD:
@@ -1994,7 +1994,7 @@
if (bi_putchk(rep, &msg) == -1)
return 0;
- si->conn.data_st = STAT_ST_INFO;
+ si->conn.xprt_st = STAT_ST_INFO;
/* fall through */
case STAT_ST_INFO:
@@ -2172,7 +2172,7 @@
si->applet.ctx.stats.px = proxy;
si->applet.ctx.stats.px_st = STAT_PX_ST_INIT;
- si->conn.data_st = STAT_ST_LIST;
+ si->conn.xprt_st = STAT_ST_LIST;
/* fall through */
case STAT_ST_LIST:
@@ -2191,7 +2191,7 @@
}
/* here, we just have reached the last proxy */
- si->conn.data_st = STAT_ST_END;
+ si->conn.xprt_st = STAT_ST_END;
/* fall through */
case STAT_ST_END:
@@ -2201,7 +2201,7 @@
return 0;
}
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
/* fall through */
case STAT_ST_FIN:
@@ -2209,7 +2209,7 @@
default:
/* unknown state ! */
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
return -1;
}
}
@@ -2222,7 +2222,7 @@
*/
static int stats_dump_proxy(struct stream_interface *si, struct proxy *px, struct uri_auth *uri)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
struct channel *rep = si->ib;
struct server *sv, *svs; /* server and server-state, server-state=server or server->track */
struct listener *l;
@@ -3271,9 +3271,9 @@
}
}
-/* This function dumps a complete session state onto the stream intreface's
- * read buffer. The data_ctx must have been zeroed first, and the flags
- * properly set. The session has to be set in data_ctx.sess.target. It returns
+/* This function dumps a complete session state onto the stream interface's
+ * read buffer. The xprt_ctx must have been zeroed first, and the flags
+ * properly set. The session has to be set in xprt_ctx.sess.target. It returns
* 0 if the output buffer is full and it needs to be called again, otherwise
* non-zero. It is designed to be called from stats_dump_sess_to_buffer() below.
*/
@@ -3516,8 +3516,8 @@
return 1;
}
-/* This function dumps all sessions' states onto the stream intreface's
- * read buffer. The data_ctx must have been zeroed first, and the flags
+/* This function dumps all sessions' states onto the stream interface's
+ * read buffer. The xprt_ctx must have been zeroed first, and the flags
* properly set. It returns 0 if the output buffer is full and it needs
* to be called again, otherwise non-zero. It is designed to be called
* from stats_dump_sess_to_buffer() below.
@@ -3530,7 +3530,7 @@
/* If we're forced to shut down, we might have to remove our
* reference to the last session being dumped.
*/
- if (si->conn.data_st == STAT_ST_LIST) {
+ if (si->conn.xprt_st == STAT_ST_LIST) {
if (!LIST_ISEMPTY(&si->applet.ctx.sess.bref.users)) {
LIST_DEL(&si->applet.ctx.sess.bref.users);
LIST_INIT(&si->applet.ctx.sess.bref.users);
@@ -3541,7 +3541,7 @@
chunk_init(&msg, trash, trashlen);
- switch (si->conn.data_st) {
+ switch (si->conn.xprt_st) {
case STAT_ST_INIT:
/* the function had not been called yet, let's prepare the
* buffer for a response. We initialize the current session
@@ -3552,7 +3552,7 @@
*/
LIST_INIT(&si->applet.ctx.sess.bref.users);
si->applet.ctx.sess.bref.ref = sessions.n;
- si->conn.data_st = STAT_ST_LIST;
+ si->conn.xprt_st = STAT_ST_LIST;
/* fall through */
case STAT_ST_LIST:
@@ -3717,30 +3717,30 @@
return 1;
}
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
/* fall through */
default:
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
return 1;
}
}
-/* This function dumps all tables' states onto the stream intreface's
- * read buffer. The data_ctx must have been zeroed first, and the flags
+/* This function dumps all tables' states onto the stream interface's
+ * read buffer. The xprt_ctx must have been zeroed first, and the flags
* properly set. It returns 0 if the output buffer is full and it needs
* to be called again, otherwise non-zero.
*/
static int stats_table_request(struct stream_interface *si, bool show)
{
- struct session *s = si->conn.data_ctx;
+ struct session *s = si->conn.xprt_ctx;
struct chunk msg;
struct ebmb_node *eb;
int dt;
bool skip_entry;
/*
- * We have 3 possible states in si->conn.data_st :
+ * We have 3 possible states in si->conn.xprt_st :
* - STAT_ST_INIT : the first call
* - STAT_ST_INFO : the proxy pointer points to the next table to
* dump, the entry pointer is NULL ;
@@ -3753,7 +3753,7 @@
if (unlikely(si->ib->flags & (CF_WRITE_ERROR|CF_SHUTW))) {
/* in case of abort, remove any refcount we might have set on an entry */
- if (si->conn.data_st == STAT_ST_LIST) {
+ if (si->conn.xprt_st == STAT_ST_LIST) {
si->applet.ctx.table.entry->ref_cnt--;
stksess_kill_if_expired(&si->applet.ctx.table.proxy->table, si->applet.ctx.table.entry);
}
@@ -3762,22 +3762,22 @@
chunk_init(&msg, trash, trashlen);
- while (si->conn.data_st != STAT_ST_FIN) {
- switch (si->conn.data_st) {
+ while (si->conn.xprt_st != STAT_ST_FIN) {
+ switch (si->conn.xprt_st) {
case STAT_ST_INIT:
si->applet.ctx.table.proxy = si->applet.ctx.table.target;
if (!si->applet.ctx.table.proxy)
si->applet.ctx.table.proxy = proxy;
si->applet.ctx.table.entry = NULL;
- si->conn.data_st = STAT_ST_INFO;
+ si->conn.xprt_st = STAT_ST_INFO;
break;
case STAT_ST_INFO:
if (!si->applet.ctx.table.proxy ||
(si->applet.ctx.table.target &&
si->applet.ctx.table.proxy != si->applet.ctx.table.target)) {
- si->conn.data_st = STAT_ST_END;
+ si->conn.xprt_st = STAT_ST_END;
break;
}
@@ -3793,7 +3793,7 @@
if (eb) {
si->applet.ctx.table.entry = ebmb_entry(eb, struct stksess, key);
si->applet.ctx.table.entry->ref_cnt++;
- si->conn.data_st = STAT_ST_LIST;
+ si->conn.xprt_st = STAT_ST_LIST;
break;
}
}
@@ -3873,11 +3873,11 @@
stksess_kill(&si->applet.ctx.table.proxy->table, si->applet.ctx.table.entry);
si->applet.ctx.table.proxy = si->applet.ctx.table.proxy->next;
- si->conn.data_st = STAT_ST_INFO;
+ si->conn.xprt_st = STAT_ST_INFO;
break;
case STAT_ST_END:
- si->conn.data_st = STAT_ST_FIN;
+ si->conn.xprt_st = STAT_ST_FIN;
break;
}
}
@@ -3942,8 +3942,8 @@
return ptr;
}
-/* This function dumps all captured errors onto the stream intreface's
- * read buffer. The data_ctx must have been zeroed first, and the flags
+/* This function dumps all captured errors onto the stream interface's
+ * read buffer. The xprt_ctx must have been zeroed first, and the flags
* properly set. It returns 0 if the output buffer is full and it needs
* to be called again, otherwise non-zero.
*/
diff --git a/src/peers.c b/src/peers.c
index 62329dc..f030613 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -184,9 +184,9 @@
{
struct task *t = (struct task *)si->owner;
struct session *s = (struct session *)t->context;
- struct peer_session *ps = (struct peer_session *)si->conn.data_ctx;
+ struct peer_session *ps = (struct peer_session *)si->conn.xprt_ctx;
- /* si->conn.data_ctx is not a peer session */
+ /* si->conn.xprt_ctx is not a peer session */
if (si->applet.st0 < PEER_SESSION_SENDSUCCESS)
return;
@@ -226,7 +226,7 @@
switchstate:
switch(si->applet.st0) {
case PEER_SESSION_ACCEPT:
- si->conn.data_ctx = NULL;
+ si->conn.xprt_ctx = NULL;
si->applet.st0 = PEER_SESSION_GETVERSION;
/* fall through */
case PEER_SESSION_GETVERSION:
@@ -332,12 +332,12 @@
goto switchstate;
}
- si->conn.data_ctx = curpeer;
+ si->conn.xprt_ctx = curpeer;
si->applet.st0 = PEER_SESSION_GETTABLE;
/* fall through */
}
case PEER_SESSION_GETTABLE: {
- struct peer *curpeer = (struct peer *)si->conn.data_ctx;
+ struct peer *curpeer = (struct peer *)si->conn.xprt_ctx;
struct shared_table *st;
struct peer_session *ps = NULL;
unsigned long key_type;
@@ -348,12 +348,12 @@
if (reql <= 0) { /* closed or EOL not found */
if (reql == 0)
goto out;
- si->conn.data_ctx = NULL;
+ si->conn.xprt_ctx = NULL;
si->applet.st0 = PEER_SESSION_END;
goto switchstate;
}
- /* Re init si->conn.data_ctx to null, to handle correctly a release case */
- si->conn.data_ctx = NULL;
+ /* Re init si->conn.xprt_ctx to null, to handle correctly a release case */
+ si->conn.xprt_ctx = NULL;
if (trash[reql-1] != '\n') {
/* Incomplete line, we quit */
@@ -379,7 +379,7 @@
p = strchr(p+1, ' ');
if (!p) {
- si->conn.data_ctx = NULL;
+ si->conn.xprt_ctx = NULL;
si->applet.st0 = PEER_SESSION_EXIT;
si->applet.st1 = PEER_SESSION_ERRPROTO;
goto switchstate;
@@ -438,12 +438,12 @@
goto switchstate;
}
- si->conn.data_ctx = ps;
+ si->conn.xprt_ctx = ps;
si->applet.st0 = PEER_SESSION_SENDSUCCESS;
/* fall through */
}
case PEER_SESSION_SENDSUCCESS:{
- struct peer_session *ps = (struct peer_session *)si->conn.data_ctx;
+ struct peer_session *ps = (struct peer_session *)si->conn.xprt_ctx;
repl = snprintf(trash, trashlen, "%d\n", PEER_SESSION_SUCCESSCODE);
repl = bi_putblk(si->ib, trash, repl);
@@ -493,7 +493,7 @@
goto switchstate;
}
case PEER_SESSION_CONNECT: {
- struct peer_session *ps = (struct peer_session *)si->conn.data_ctx;
+ struct peer_session *ps = (struct peer_session *)si->conn.xprt_ctx;
/* Send headers */
repl = snprintf(trash, trashlen,
@@ -523,7 +523,7 @@
/* fall through */
}
case PEER_SESSION_GETSTATUS: {
- struct peer_session *ps = (struct peer_session *)si->conn.data_ctx;
+ struct peer_session *ps = (struct peer_session *)si->conn.xprt_ctx;
if (si->ib->flags & CF_WRITE_PARTIAL)
ps->statuscode = PEER_SESSION_CONNECTEDCODE;
@@ -594,7 +594,7 @@
/* fall through */
}
case PEER_SESSION_WAITMSG: {
- struct peer_session *ps = (struct peer_session *)si->conn.data_ctx;
+ struct peer_session *ps = (struct peer_session *)si->conn.xprt_ctx;
char c;
int totl = 0;
@@ -1063,7 +1063,7 @@
/* call release to reinit resync states if needed */
peer_session_release(oldsi);
oldsi->applet.st0 = PEER_SESSION_END;
- oldsi->conn.data_ctx = NULL;
+ oldsi->conn.xprt_ctx = NULL;
task_wakeup(session->task, TASK_WOKEN_MSG);
}
@@ -1078,7 +1078,7 @@
/* we have a dedicated I/O handler for the stats */
stream_int_register_handler(&s->si[1], &peer_applet);
copy_target(&s->target, &s->si[1].conn.target); // for logging only
- s->si[1].conn.data_ctx = s;
+ s->si[1].conn.xprt_ctx = s;
s->si[1].applet.st0 = PEER_SESSION_ACCEPT;
tv_zero(&s->logs.tv_request);
@@ -1164,7 +1164,7 @@
stream_int_register_handler(&s->si[0], &peer_applet);
s->si[0].applet.st0 = PEER_SESSION_CONNECT;
- s->si[0].conn.data_ctx = (void *)ps;
+ s->si[0].conn.xprt_ctx = (void *)ps;
s->si[1].conn.t.sock.fd = -1; /* just to help with debugging */
s->si[1].conn.flags = CO_FL_NONE;
@@ -1176,7 +1176,7 @@
s->si[1].release = NULL;
s->si[1].send_proxy_ofs = 0;
set_target_proxy(&s->si[1].conn.target, s->be);
- si_prepare_conn(&s->si[1], peer->proto, peer->data);
+ si_prepare_conn(&s->si[1], peer->proto, peer->xprt);
s->si[1].exp = TICK_ETERNITY;
s->si[1].flags = SI_FL_NONE;
if (s->be->options2 & PR_O2_INDEPSTR)
diff --git a/src/proto_http.c b/src/proto_http.c
index 85ee021..7ddd240 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3034,7 +3034,7 @@
s->task->nice = -32; /* small boost for HTTP statistics */
stream_int_register_handler(s->rep->prod, &http_stats_applet);
copy_target(&s->target, &s->rep->prod->conn.target); // for logging only
- s->rep->prod->conn.data_ctx = s;
+ s->rep->prod->conn.xprt_ctx = s;
s->rep->prod->applet.st0 = s->rep->prod->applet.st1 = 0;
req->analysers = 0;
if (s->fe == s->be) /* report it if the request was intercepted by the frontend */
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 7c3258c..ea6f943 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -460,7 +460,7 @@
fd_insert(fd);
conn_sock_want_send(conn); /* for connect status */
- if (conn_data_init(conn) < 0) {
+ if (conn_xprt_init(conn) < 0) {
fd_delete(fd);
return SN_ERR_RESOURCE;
}
@@ -550,8 +550,8 @@
}
/* The FD is ready now, we'll mark the connection as complete and
- * forward the event to the data layer which will update the stream
- * interface flags.
+ * forward the event to the transport layer which will notify the
+ * data layer.
*/
conn->flags &= ~CO_FL_WAIT_L4_CONN;
return 1;
diff --git a/src/raw_sock.c b/src/raw_sock.c
index 1330fad..9298ed7 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -1,5 +1,5 @@
/*
- * Functions used to send/receive data using SOCK_STREAM sockets.
+ * RAW transport layer over SOCK_STREAM sockets.
*
* Copyright 2000-2012 Willy Tarreau <w@1wt.eu>
*
@@ -334,8 +334,8 @@
}
-/* data-layer operations for RAW sockets */
-struct data_ops raw_sock = {
+/* transport-layer operations for RAW sockets */
+struct xprt_ops raw_sock = {
.snd_buf = raw_sock_from_buf,
.rcv_buf = raw_sock_to_buf,
#if defined(CONFIG_HAP_LINUX_SPLICE)
diff --git a/src/session.c b/src/session.c
index 91684ad..975176c 100644
--- a/src/session.c
+++ b/src/session.c
@@ -161,18 +161,18 @@
t->nice = l->nice;
s->task = t;
- /* add the various callbacks. Right now the data layer is present but
- * not initialized. Also note we need to be careful as the stream int
- * is not initialized yet.
+ /* Add the various callbacks. Right now the transport layer is present
+ * but not initialized. Also note we need to be careful as the stream
+ * int is not initialized yet.
*/
- si_prepare_conn(&s->si[0], l->proto, l->data);
+ si_prepare_conn(&s->si[0], l->proto, l->xprt);
/* finish initialization of the accepted file descriptor */
fd_insert(cfd);
fdtab[cfd].owner = &s->si[0].conn;
fdtab[cfd].iocb = conn_fd_handler;
conn_data_want_recv(&s->si[0].conn);
- if (conn_data_init(&s->si[0].conn) < 0)
+ if (conn_xprt_init(&s->si[0].conn) < 0)
goto out_free_task;
/* OK, now either we have a pending handshake to execute with and
@@ -203,7 +203,7 @@
session_store_counters(s);
pool_free2(pool2_session, s);
out_close:
- if (ret < 0 && l->data == &raw_sock && p->mode == PR_MODE_HTTP) {
+ if (ret < 0 && l->xprt == &raw_sock && p->mode == PR_MODE_HTTP) {
/* critical error, no more memory, try to emit a 500 response */
struct chunk *err_msg = http_error_message(s, HTTP_ERR_500);
send(cfd, err_msg->str, err_msg->len, MSG_DONTWAIT|MSG_NOSIGNAL);
@@ -217,13 +217,13 @@
}
/* This function kills an existing embryonic session. It stops the connection's
- * data layer, releases assigned resources, resumes the listener if it was
+ * transport layer, releases assigned resources, resumes the listener if it was
* disabled and finally kills the file descriptor.
*/
static void kill_mini_session(struct session *s)
{
/* kill the connection now */
- conn_data_close(&s->si[0].conn);
+ conn_xprt_close(&s->si[0].conn);
s->fe->feconn--;
if (s->stkctr1_entry || s->stkctr2_entry)
@@ -697,7 +697,7 @@
si->state = SI_ST_CER;
fd_delete(si_fd(si));
- conn_data_close(&si->conn);
+ conn_xprt_close(&si->conn);
if (si->release)
si->release(si);
@@ -2014,8 +2014,8 @@
if (!(s->req->flags & (CF_KERN_SPLICING|CF_SHUTR)) &&
s->req->to_forward &&
(global.tune.options & GTUNE_USE_SPLICE) &&
- (s->si[0].conn.data && s->si[0].conn.data->rcv_pipe && s->si[0].conn.data->snd_pipe) &&
- (s->si[1].conn.data && s->si[1].conn.data->rcv_pipe && s->si[1].conn.data->snd_pipe) &&
+ (s->si[0].conn.xprt && s->si[0].conn.xprt->rcv_pipe && s->si[0].conn.xprt->snd_pipe) &&
+ (s->si[1].conn.xprt && s->si[1].conn.xprt->rcv_pipe && s->si[1].conn.xprt->snd_pipe) &&
(pipes_used < global.maxpipes) &&
(((s->fe->options2|s->be->options2) & PR_O2_SPLIC_REQ) ||
(((s->fe->options2|s->be->options2) & PR_O2_SPLIC_AUT) &&
@@ -2160,8 +2160,8 @@
if (!(s->rep->flags & (CF_KERN_SPLICING|CF_SHUTR)) &&
s->rep->to_forward &&
(global.tune.options & GTUNE_USE_SPLICE) &&
- (s->si[0].conn.data && s->si[0].conn.data->rcv_pipe && s->si[0].conn.data->snd_pipe) &&
- (s->si[1].conn.data && s->si[1].conn.data->rcv_pipe && s->si[1].conn.data->snd_pipe) &&
+ (s->si[0].conn.xprt && s->si[0].conn.xprt->rcv_pipe && s->si[0].conn.xprt->snd_pipe) &&
+ (s->si[1].conn.xprt && s->si[1].conn.xprt->rcv_pipe && s->si[1].conn.xprt->snd_pipe) &&
(pipes_used < global.maxpipes) &&
(((s->fe->options2|s->be->options2) & PR_O2_SPLIC_RTR) ||
(((s->fe->options2|s->be->options2) & PR_O2_SPLIC_AUT) &&
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index efef155..7c5ffbe 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -1,5 +1,5 @@
/*
- * SSL data transfer functions between buffers and SOCK_STREAM sockets
+ * SSL/TLS transport layer over SOCK_STREAM sockets
*
* Copyright (C) 2012 EXCELIANCE, Emeric Brun <ebrun@exceliance.fr>
*
@@ -108,7 +108,7 @@
ssl = X509_STORE_CTX_get_ex_data(x_store, SSL_get_ex_data_X509_STORE_CTX_idx());
conn = (struct connection *)SSL_get_app_data(ssl);
- conn->data_st |= SSL_SOCK_ST_FL_VERIFY_DONE;
+ conn->xprt_st |= SSL_SOCK_ST_FL_VERIFY_DONE;
if (ok) /* no errors */
return ok;
@@ -118,9 +118,9 @@
/* check if CA error needs to be ignored */
if (depth > 0) {
- if (!SSL_SOCK_ST_TO_CA_ERROR(conn->data_st)) {
- conn->data_st |= SSL_SOCK_CA_ERROR_TO_ST(err);
- conn->data_st |= SSL_SOCK_CAEDEPTH_TO_ST(depth);
+ if (!SSL_SOCK_ST_TO_CA_ERROR(conn->xprt_st)) {
+ conn->xprt_st |= SSL_SOCK_CA_ERROR_TO_ST(err);
+ conn->xprt_st |= SSL_SOCK_CAEDEPTH_TO_ST(depth);
}
if (target_client(&conn->target)->bind_conf->ca_ignerr & (1ULL << err))
@@ -129,8 +129,8 @@
return 0;
}
- if (!SSL_SOCK_ST_TO_CRTERROR(conn->data_st))
- conn->data_st |= SSL_SOCK_CRTERROR_TO_ST(err);
+ if (!SSL_SOCK_ST_TO_CRTERROR(conn->xprt_st))
+ conn->xprt_st |= SSL_SOCK_CRTERROR_TO_ST(err);
/* check if certificate error needs to be ignored */
if (target_client(&conn->target)->bind_conf->crt_ignerr & (1ULL << err))
@@ -636,7 +636,7 @@
static int ssl_sock_init(struct connection *conn)
{
/* already initialized */
- if (conn->data_ctx)
+ if (conn->xprt_ctx)
return 0;
if (global.maxsslconn && sslconns >= global.maxsslconn)
@@ -646,16 +646,16 @@
in connect state otherwise accept state */
if (target_srv(&conn->target)) {
/* Alloc a new SSL session ctx */
- conn->data_ctx = SSL_new(target_srv(&conn->target)->ssl_ctx.ctx);
- if (!conn->data_ctx)
+ conn->xprt_ctx = SSL_new(target_srv(&conn->target)->ssl_ctx.ctx);
+ if (!conn->xprt_ctx)
return -1;
- SSL_set_connect_state(conn->data_ctx);
+ SSL_set_connect_state(conn->xprt_ctx);
if (target_srv(&conn->target)->ssl_ctx.reused_sess)
- SSL_set_session(conn->data_ctx, target_srv(&conn->target)->ssl_ctx.reused_sess);
+ SSL_set_session(conn->xprt_ctx, target_srv(&conn->target)->ssl_ctx.reused_sess);
/* set fd on SSL session context */
- SSL_set_fd(conn->data_ctx, conn->t.sock.fd);
+ SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd);
/* leave init state and start handshake */
conn->flags |= CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN;
@@ -665,17 +665,17 @@
}
else if (target_client(&conn->target)) {
/* Alloc a new SSL session ctx */
- conn->data_ctx = SSL_new(target_client(&conn->target)->bind_conf->default_ctx);
- if (!conn->data_ctx)
+ conn->xprt_ctx = SSL_new(target_client(&conn->target)->bind_conf->default_ctx);
+ if (!conn->xprt_ctx)
return -1;
- SSL_set_accept_state(conn->data_ctx);
+ SSL_set_accept_state(conn->xprt_ctx);
/* set fd on SSL session context */
- SSL_set_fd(conn->data_ctx, conn->t.sock.fd);
+ SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd);
/* set connection pointer */
- SSL_set_app_data(conn->data_ctx, conn);
+ SSL_set_app_data(conn->xprt_ctx, conn);
/* leave init state and start handshake */
conn->flags |= CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN;
@@ -698,13 +698,13 @@
{
int ret;
- if (!conn->data_ctx)
+ if (!conn->xprt_ctx)
goto out_error;
- ret = SSL_do_handshake(conn->data_ctx);
+ ret = SSL_do_handshake(conn->xprt_ctx);
if (ret != 1) {
/* handshake did not complete, let's find why */
- ret = SSL_get_error(conn->data_ctx, ret);
+ ret = SSL_get_error(conn->xprt_ctx, ret);
if (ret == SSL_ERROR_WANT_WRITE) {
/* SSL handshake needs to write, L4 connection may not be ready */
@@ -734,12 +734,12 @@
/* Handshake succeeded */
if (target_srv(&conn->target)) {
- if (!SSL_session_reused(conn->data_ctx)) {
+ if (!SSL_session_reused(conn->xprt_ctx)) {
/* check if session was reused, if not store current session on server for reuse */
if (target_srv(&conn->target)->ssl_ctx.reused_sess)
SSL_SESSION_free(target_srv(&conn->target)->ssl_ctx.reused_sess);
- target_srv(&conn->target)->ssl_ctx.reused_sess = SSL_get1_session(conn->data_ctx);
+ target_srv(&conn->target)->ssl_ctx.reused_sess = SSL_get1_session(conn->xprt_ctx);
}
}
@@ -768,7 +768,7 @@
int ret, done = 0;
int try = count;
- if (!conn->data_ctx)
+ if (!conn->xprt_ctx)
goto out_error;
if (conn->flags & CO_FL_HANDSHAKE)
@@ -793,7 +793,7 @@
* EINTR too.
*/
while (try) {
- ret = SSL_read(conn->data_ctx, bi_end(buf), try);
+ ret = SSL_read(conn->xprt_ctx, bi_end(buf), try);
if (conn->flags & CO_FL_ERROR) {
/* CO_FL_ERROR may be set by ssl_sock_infocbk */
break;
@@ -810,7 +810,7 @@
goto read0;
}
else {
- ret = SSL_get_error(conn->data_ctx, ret);
+ ret = SSL_get_error(conn->xprt_ctx, ret);
if (ret == SSL_ERROR_WANT_WRITE) {
/* handshake is running, and it needs to poll for a write event */
conn->flags |= CO_FL_SSL_WAIT_HS;
@@ -853,7 +853,7 @@
done = 0;
- if (!conn->data_ctx)
+ if (!conn->xprt_ctx)
goto out_error;
if (conn->flags & CO_FL_HANDSHAKE)
@@ -870,7 +870,7 @@
if (buf->data + try > buf->p)
try = buf->data + try - buf->p;
- ret = SSL_write(conn->data_ctx, bo_ptr(buf), try);
+ ret = SSL_write(conn->xprt_ctx, bo_ptr(buf), try);
if (conn->flags & CO_FL_ERROR) {
/* CO_FL_ERROR may be set by ssl_sock_infocbk */
break;
@@ -888,7 +888,7 @@
break;
}
else {
- ret = SSL_get_error(conn->data_ctx, ret);
+ ret = SSL_get_error(conn->xprt_ctx, ret);
if (ret == SSL_ERROR_WANT_WRITE) {
/* we need to poll to retry a write later */
__conn_data_poll_send(conn);
@@ -917,9 +917,9 @@
static void ssl_sock_close(struct connection *conn) {
- if (conn->data_ctx) {
- SSL_free(conn->data_ctx);
- conn->data_ctx = NULL;
+ if (conn->xprt_ctx) {
+ SSL_free(conn->xprt_ctx);
+ conn->xprt_ctx = NULL;
sslconns--;
}
}
@@ -933,10 +933,10 @@
return;
/* no handshake was in progress, try a clean ssl shutdown */
if (clean)
- SSL_shutdown(conn->data_ctx);
+ SSL_shutdown(conn->xprt_ctx);
/* force flag on ssl to keep session in cache regardless shutdown result */
- SSL_set_shutdown(conn->data_ctx, SSL_SENT_SHUTDOWN);
+ SSL_set_shutdown(conn->xprt_ctx, SSL_SENT_SHUTDOWN);
}
/***** Below are some sample fetching functions for ACL/patterns *****/
@@ -946,7 +946,7 @@
smp_fetch_client_crt(struct proxy *px, struct session *l4, void *l7, unsigned int opt,
const struct arg *args, struct sample *smp)
{
- if (!l4 || l4->si[0].conn.data != &ssl_sock)
+ if (!l4 || l4->si[0].conn.xprt != &ssl_sock)
return 0;
if (!(l4->si[0].conn.flags & CO_FL_CONNECTED)) {
@@ -956,32 +956,32 @@
smp->flags = 0;
smp->type = SMP_T_BOOL;
- smp->data.uint = SSL_SOCK_ST_FL_VERIFY_DONE & l4->si[0].conn.data_st ? 1 : 0;
+ smp->data.uint = SSL_SOCK_ST_FL_VERIFY_DONE & l4->si[0].conn.xprt_st ? 1 : 0;
return 1;
}
-/* boolean, returns true if data layer is SSL */
+/* boolean, returns true if transport layer is SSL */
static int
smp_fetch_is_ssl(struct proxy *px, struct session *l4, void *l7, unsigned int opt,
const struct arg *args, struct sample *smp)
{
smp->type = SMP_T_BOOL;
- smp->data.uint = (l4->si[0].conn.data == &ssl_sock);
+ smp->data.uint = (l4->si[0].conn.xprt == &ssl_sock);
return 1;
}
-/* boolean, returns true if data layer is SSL */
+/* boolean, returns true if transport layer is SSL */
static int
smp_fetch_has_sni(struct proxy *px, struct session *l4, void *l7, unsigned int opt,
const struct arg *args, struct sample *smp)
{
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
smp->type = SMP_T_BOOL;
- smp->data.uint = (l4->si[0].conn.data == &ssl_sock) &&
- l4->si[0].conn.data_ctx &&
- SSL_get_servername(l4->si[0].conn.data_ctx, TLSEXT_NAMETYPE_host_name) != NULL;
+ smp->data.uint = (l4->si[0].conn.xprt == &ssl_sock) &&
+ l4->si[0].conn.xprt_ctx &&
+ SSL_get_servername(l4->si[0].conn.xprt_ctx, TLSEXT_NAMETYPE_host_name) != NULL;
return 1;
#else
return 0;
@@ -996,10 +996,10 @@
smp->flags = 0;
smp->type = SMP_T_CSTR;
- if (!l4 || !l4->si[0].conn.data_ctx || l4->si[0].conn.data != &ssl_sock)
+ if (!l4 || !l4->si[0].conn.xprt_ctx || l4->si[0].conn.xprt != &ssl_sock)
return 0;
- smp->data.str.str = (char *)SSL_get_servername(l4->si[0].conn.data_ctx, TLSEXT_NAMETYPE_host_name);
+ smp->data.str.str = (char *)SSL_get_servername(l4->si[0].conn.xprt_ctx, TLSEXT_NAMETYPE_host_name);
if (!smp->data.str.str)
return 0;
@@ -1015,7 +1015,7 @@
smp_fetch_verify_caerr(struct proxy *px, struct session *l4, void *l7, unsigned int opt,
const struct arg *args, struct sample *smp)
{
- if (!l4 || l4->si[0].conn.data != &ssl_sock)
+ if (!l4 || l4->si[0].conn.xprt != &ssl_sock)
return 0;
if (!(l4->si[0].conn.flags & CO_FL_CONNECTED)) {
@@ -1024,7 +1024,7 @@
}
smp->type = SMP_T_UINT;
- smp->data.uint = (unsigned int)SSL_SOCK_ST_TO_CA_ERROR(l4->si[0].conn.data_st);
+ smp->data.uint = (unsigned int)SSL_SOCK_ST_TO_CA_ERROR(l4->si[0].conn.xprt_st);
smp->flags = 0;
return 1;
@@ -1035,7 +1035,7 @@
smp_fetch_verify_caerr_depth(struct proxy *px, struct session *l4, void *l7, unsigned int opt,
const struct arg *args, struct sample *smp)
{
- if (!l4 || l4->si[0].conn.data != &ssl_sock)
+ if (!l4 || l4->si[0].conn.xprt != &ssl_sock)
return 0;
if (!(l4->si[0].conn.flags & CO_FL_CONNECTED)) {
@@ -1044,7 +1044,7 @@
}
smp->type = SMP_T_UINT;
- smp->data.uint = (unsigned int)SSL_SOCK_ST_TO_CAEDEPTH(l4->si[0].conn.data_st);
+ smp->data.uint = (unsigned int)SSL_SOCK_ST_TO_CAEDEPTH(l4->si[0].conn.xprt_st);
smp->flags = 0;
return 1;
@@ -1055,7 +1055,7 @@
smp_fetch_verify_crterr(struct proxy *px, struct session *l4, void *l7, unsigned int opt,
const struct arg *args, struct sample *smp)
{
- if (!l4 || l4->si[0].conn.data != &ssl_sock)
+ if (!l4 || l4->si[0].conn.xprt != &ssl_sock)
return 0;
if (!(l4->si[0].conn.flags & CO_FL_CONNECTED)) {
@@ -1064,7 +1064,7 @@
}
smp->type = SMP_T_UINT;
- smp->data.uint = (unsigned int)SSL_SOCK_ST_TO_CRTERROR(l4->si[0].conn.data_st);
+ smp->data.uint = (unsigned int)SSL_SOCK_ST_TO_CRTERROR(l4->si[0].conn.xprt_st);
smp->flags = 0;
return 1;
@@ -1075,7 +1075,7 @@
smp_fetch_verify_result(struct proxy *px, struct session *l4, void *l7, unsigned int opt,
const struct arg *args, struct sample *smp)
{
- if (!l4 || l4->si[0].conn.data != &ssl_sock)
+ if (!l4 || l4->si[0].conn.xprt != &ssl_sock)
return 0;
if (!(l4->si[0].conn.flags & CO_FL_CONNECTED)) {
@@ -1083,11 +1083,11 @@
return 0;
}
- if (!l4->si[0].conn.data_ctx)
+ if (!l4->si[0].conn.xprt_ctx)
return 0;
smp->type = SMP_T_UINT;
- smp->data.uint = (unsigned int)SSL_get_verify_result(l4->si[0].conn.data_ctx);
+ smp->data.uint = (unsigned int)SSL_get_verify_result(l4->si[0].conn.xprt_ctx);
smp->flags = 0;
return 1;
@@ -1263,7 +1263,7 @@
conf->is_ssl = 1;
list_for_each_entry(l, &conf->listeners, by_bind)
- l->data = &ssl_sock;
+ l->xprt = &ssl_sock;
return 0;
}
@@ -1351,8 +1351,8 @@
{ NULL, NULL, 0 },
}};
-/* data-layer operations for SSL sockets */
-struct data_ops ssl_sock = {
+/* transport-layer operations for SSL sockets */
+struct xprt_ops ssl_sock = {
.snd_buf = ssl_sock_from_buf,
.rcv_buf = ssl_sock_to_buf,
.rcv_pipe = NULL,
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 78c061c..625ca73 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -243,7 +243,7 @@
return 0;
if (si->ob->flags & CF_SHUTW) {
- conn_data_close(&si->conn);
+ conn_xprt_close(&si->conn);
if (conn->ctrl)
fd_delete(si_fd(si));
si->state = SI_ST_DIS;
@@ -308,12 +308,12 @@
(struct linger *) &nolinger, sizeof(struct linger));
}
/* unclean data-layer shutdown */
- if (conn->data && conn->data->shutw)
- conn->data->shutw(conn, 0);
+ if (conn->xprt && conn->xprt->shutw)
+ conn->xprt->shutw(conn, 0);
} else {
/* clean data-layer shutdown */
- if (conn->data && conn->data->shutw)
- conn->data->shutw(conn, 1);
+ if (conn->xprt && conn->xprt->shutw)
+ conn->xprt->shutw(conn, 1);
if (!(si->flags & SI_FL_NOHALF)) {
/* We shutdown transport layer */
@@ -334,7 +334,7 @@
/* we may have to close a pending connection, and mark the
* response buffer as shutr
*/
- conn_data_close(&si->conn);
+ conn_xprt_close(&si->conn);
if (conn->ctrl)
fd_delete(si_fd(si));
/* fall through */
@@ -660,7 +660,7 @@
/*
* This function is called to send buffer data to a stream socket.
* It returns -1 in case of unrecoverable error, otherwise zero.
- * It iterates the data layer's snd_buf function. It relies on the
+ * It iterates the transport layer's snd_buf function. It relies on the
* caller to commit polling changes.
*/
static int si_conn_send_loop(struct connection *conn)
@@ -670,8 +670,8 @@
int write_poll = MAX_WRITE_POLL_LOOPS;
int ret;
- if (b->pipe && conn->data->snd_pipe) {
- ret = conn->data->snd_pipe(conn, b->pipe);
+ if (b->pipe && conn->xprt->snd_pipe) {
+ ret = conn->xprt->snd_pipe(conn, b->pipe);
if (ret > 0)
b->flags |= CF_WRITE_PARTIAL;
@@ -712,7 +712,7 @@
((b->flags & (CF_SHUTW|CF_SHUTW_NOW|CF_HIJACK)) == CF_SHUTW_NOW))
send_flag |= MSG_MORE;
- ret = conn->data->snd_buf(conn, &b->buf, send_flag);
+ ret = conn->xprt->snd_buf(conn, &b->buf, send_flag);
if (ret <= 0)
break;
@@ -935,8 +935,8 @@
/*
* This is the callback which is called by the connection layer to receive data
- * into the buffer from the connection. It iterates over the data layer's rcv_buf
- * function.
+ * into the buffer from the connection. It iterates over the transport layer's
+ * rcv_buf function.
*/
void si_conn_recv_cb(struct connection *conn)
{
@@ -967,7 +967,7 @@
/* First, let's see if we may splice data across the channel without
* using a buffer.
*/
- if (conn->data->rcv_pipe &&
+ if (conn->xprt->rcv_pipe &&
b->to_forward >= MIN_SPLICE_FORWARD && b->flags & CF_KERN_SPLICING) {
if (buffer_not_empty(&b->buf)) {
/* We're embarrassed, there are already data pending in
@@ -985,7 +985,7 @@
}
}
- ret = conn->data->rcv_pipe(conn, b->pipe, b->to_forward);
+ ret = conn->xprt->rcv_pipe(conn, b->pipe, b->to_forward);
if (ret < 0) {
/* splice not supported on this end, let's disable it */
b->flags &= ~CF_KERN_SPLICING;
@@ -1027,7 +1027,7 @@
break;
}
- ret = conn->data->rcv_buf(conn, &b->buf, max);
+ ret = conn->xprt->rcv_buf(conn, &b->buf, max);
if (ret <= 0)
break;
@@ -1149,8 +1149,8 @@
/*
* This is the callback which is called by the connection layer to send data
- * from the buffer to the connection. It iterates over the data layer's snd_buf
- * function.
+ * from the buffer to the connection. It iterates over the transport layer's
+ * snd_buf function.
*/
void si_conn_send_cb(struct connection *conn)
{
@@ -1210,8 +1210,8 @@
(struct linger *) &nolinger, sizeof(struct linger));
}
/* force flag on ssl to keep session in cache */
- if (si->conn.data->shutw)
- si->conn.data->shutw(&si->conn, 0);
+ if (si->conn.xprt->shutw)
+ si->conn.xprt->shutw(&si->conn, 0);
goto do_close;
}
@@ -1220,7 +1220,7 @@
return;
do_close:
- conn_data_close(&si->conn);
+ conn_xprt_close(&si->conn);
fd_delete(si_fd(si));
si->state = SI_ST_DIS;
si->exp = TICK_ETERNITY;