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

MEDIUM: stream-interface: remove now unused pointers to channels

Browse Source 
Everyone must now use si_ic() / si_oc() to find the relevant channels,
the points have been totally removed.
This commit is contained in:
Willy Tarreau 2014-11-28 11:53:35 +01:00
parent 0b2fb7f9a3
commit a2df3fa251
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/types/stream_interface.h
View File

@ -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 <stdlib.h>
#include <sys/socket.h>
#include <types/channel.h>
#include <types/connection.h>
#include <types/hlua.h>
#include <types/obj_type.h>
#include <common/config.h>
@ -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 */

6
src/hlua.c
View File

@ -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;

2
src/peers.c
View File

@ -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;

2
src/session.c
View File

@ -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) {