RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-16 08:24:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: frontend: make ->accept only return +/-1

Browse Source 
This function was specified as being able to return 3 states, which had
repercussions to the stream accept function. It was used at the time
when the frontend would do the monitoring itself. This is not the case
anymore, so let's simplify this.
This commit is contained in:
Willy Tarreau 2015-04-05 11:52:08 +02:00
parent 342bfb180c
commit c5a7ff4a86
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend.c
View File

@ -48,8 +48,7 @@
/* Finish a stream accept() for a proxy (TCP or HTTP). It returns a negative
* value in case of a critical failure which must cause the listener to be
* disabled, a positive value in case of success, or zero if it is a success
* but the stream must be closed ASAP (eg: monitoring). It only supports
* disabled, a positive or null value in case of success. It only supports
* streams with a connection in si[0].
*/
int frontend_accept(struct stream *s)

14
src/stream.c
View File

@ -213,16 +213,8 @@ int stream_accept_session(struct session *sess, struct task *t)
else if (appctx)
s->si[0].flags |= SI_FL_WAIT_DATA;
/* FIXME: we shouldn't restrict ourselves to connections but for now
* the only ->accept() only works with sessions.
*/
if (conn && p->accept && (ret = p->accept(s)) <= 0) {
/* Either we had an unrecoverable error (<0) or work is
* finished (=0, eg: monitoring), in both situations,
* we can release everything and close.
*/
goto out_free_strm;
}
if (conn && p->accept && p->accept(s) < 0)
goto out_fail_accept;
if (conn) {
/* if logs require transport layer information, note it on the connection */
@ -241,7 +233,7 @@ int stream_accept_session(struct session *sess, struct task *t)
return 1;
/* Error unrolling */
out_free_strm:
out_fail_accept:
LIST_DEL(&s->list);
pool_free2(pool2_stream, s);
out_return: