From a2df3fa25165f15d8faca6bccce19efba28032f7 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 28 Nov 2014 11:53:35 +0100 Subject: [PATCH] MEDIUM: stream-interface: remove now unused pointers to channels Everyone must now use si_ic() / si_oc() to find the relevant channels, the points have been totally removed. --- include/types/stream_interface.h | 5 +---- src/hlua.c | 6 ------ src/peers.c | 2 -- src/session.c | 2 -- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/include/types/stream_interface.h b/include/types/stream_interface.h index 49507a4f1..9d81bbc8c 100644 --- a/include/types/stream_interface.h +++ b/include/types/stream_interface.h @@ -2,7 +2,7 @@ * include/types/stream_interface.h * This file describes the stream_interface struct and associated constants. * - * Copyright (C) 2000-2011 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 * modify it under the terms of the GNU Lesser General Public @@ -25,8 +25,6 @@ #include #include -#include -#include #include #include #include @@ -177,7 +175,6 @@ struct stream_interface { enum si_state prev_state;/* SI_ST*, copy of previous state */ unsigned short flags; /* SI_FL_* */ unsigned int exp; /* wake up time for connect, queue, turn-around, ... */ - struct channel *ib, *ob; /* input and output buffers */ void *owner; /* generally a (struct task*) */ enum obj_type *end; /* points to the end point (connection or appctx) */ struct si_ops *ops; /* general operations at the stream interface layer */ diff --git a/src/hlua.c b/src/hlua.c index e899f08ca..af53cea67 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -1915,12 +1915,6 @@ __LJMP static int hlua_socket_new(lua_State *L) socket->s->res.prod = &socket->s->si[1]; socket->s->res.cons = &socket->s->si[0]; - socket->s->si[0].ib = &socket->s->req; - socket->s->si[0].ob = &socket->s->res; - - socket->s->si[1].ib = &socket->s->res; - socket->s->si[1].ob = &socket->s->req; - socket->s->req.analysers = 0; socket->s->req.rto = socket_proxy.timeout.client; socket->s->req.wto = socket_proxy.timeout.server; diff --git a/src/peers.c b/src/peers.c index d16331d99..b6f573e1d 100644 --- a/src/peers.c +++ b/src/peers.c @@ -1240,7 +1240,6 @@ static struct session *peer_session_create(struct peer *peer, struct peer_sessio channel_init(&s->req); s->req.prod = &s->si[0]; s->req.cons = &s->si[1]; - s->si[0].ib = s->si[1].ob = &s->req; s->req.flags |= CF_READ_ATTACHED; /* the producer is already connected */ @@ -1259,7 +1258,6 @@ static struct session *peer_session_create(struct peer *peer, struct peer_sessio channel_init(&s->res); s->res.prod = &s->si[1]; s->res.cons = &s->si[0]; - s->si[0].ob = s->si[1].ib = &s->res; s->res.rto = s->be->timeout.server; s->res.wto = s->fe->timeout.client; diff --git a/src/session.c b/src/session.c index c06e29f50..f271e4126 100644 --- a/src/session.c +++ b/src/session.c @@ -490,7 +490,6 @@ int session_complete(struct session *s) channel_init(&s->req); s->req.prod = &s->si[0]; s->req.cons = &s->si[1]; - s->si[0].ib = s->si[1].ob = &s->req; s->req.flags |= CF_READ_ATTACHED; /* the producer is already connected */ /* activate default analysers enabled for this listener */ @@ -505,7 +504,6 @@ int session_complete(struct session *s) channel_init(&s->res); s->res.prod = &s->si[1]; s->res.cons = &s->si[0]; - s->si[0].ob = s->si[1].ib = &s->res; s->res.analysers = 0; if (s->fe->options2 & PR_O2_NODELAY) {