"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/tcp_rules.c" between
haproxy-2.2.1.tar.gz and haproxy-2.2.2.tar.gz

About: HAProxy is a TCP/HTTP reverse proxy which is particularly suited for high availability environments.

tcp_rules.c  (haproxy-2.2.1):tcp_rules.c  (haproxy-2.2.2)
skipping to change at line 356 skipping to change at line 356
/* if we get there, it means we have no rule which matches, or /* if we get there, it means we have no rule which matches, or
* we have an explicit accept, so we apply the default accept. * we have an explicit accept, so we apply the default accept.
*/ */
rep->analysers &= ~an_bit; rep->analysers &= ~an_bit;
rep->analyse_exp = TICK_ETERNITY; rep->analyse_exp = TICK_ETERNITY;
DBG_TRACE_LEAVE(STRM_EV_STRM_ANA|STRM_EV_TCP_ANA, s); DBG_TRACE_LEAVE(STRM_EV_STRM_ANA|STRM_EV_TCP_ANA, s);
return 1; return 1;
missing_data: missing_data:
channel_dont_close(rep); channel_dont_close(rep);
s->current_rule = rule; /* just set the analyser timeout once at the beginning of the response */
if (!tick_isset(rep->analyse_exp) && s->be->tcp_rep.inspect_delay)
rep->analyse_exp = tick_add(now_ms, s->be->tcp_rep.inspect_delay)
;
DBG_TRACE_DEVEL("waiting for more data", STRM_EV_STRM_ANA|STRM_EV_TCP_ANA , s); DBG_TRACE_DEVEL("waiting for more data", STRM_EV_STRM_ANA|STRM_EV_TCP_ANA , s);
return 0; return 0;
deny: deny:
_HA_ATOMIC_ADD(&s->sess->fe->fe_counters.denied_resp, 1); _HA_ATOMIC_ADD(&s->sess->fe->fe_counters.denied_resp, 1);
_HA_ATOMIC_ADD(&s->be->be_counters.denied_resp, 1); _HA_ATOMIC_ADD(&s->be->be_counters.denied_resp, 1);
if (s->sess->listener->counters) if (s->sess->listener->counters)
_HA_ATOMIC_ADD(&s->sess->listener->counters->denied_resp, 1); _HA_ATOMIC_ADD(&s->sess->listener->counters->denied_resp, 1);
if (objt_server(s->target)) if (objt_server(s->target))
_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.denied_resp, 1 ); _HA_ATOMIC_ADD(&__objt_server(s->target)->counters.denied_resp, 1 );
skipping to change at line 391 skipping to change at line 393
_HA_ATOMIC_ADD(&s->be->be_counters.failed_resp, 1); _HA_ATOMIC_ADD(&s->be->be_counters.failed_resp, 1);
if (objt_server(s->target)) if (objt_server(s->target))
_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_resp, 1 ); _HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_resp, 1 );
reject: reject:
si_must_kill_conn(chn_prod(rep)); si_must_kill_conn(chn_prod(rep));
channel_abort(rep); channel_abort(rep);
channel_abort(&s->req); channel_abort(&s->req);
abort: abort:
rep->analysers &= AN_REQ_FLT_END; rep->analysers &= AN_RES_FLT_END;
if (!(s->flags & SF_ERR_MASK)) if (!(s->flags & SF_ERR_MASK))
s->flags |= SF_ERR_PRXCOND; s->flags |= SF_ERR_PRXCOND;
if (!(s->flags & SF_FINST_MASK)) if (!(s->flags & SF_FINST_MASK))
s->flags |= SF_FINST_D; s->flags |= SF_FINST_D;
DBG_TRACE_DEVEL("leaving on error", STRM_EV_STRM_ANA|STRM_EV_TCP_ANA|STRM _EV_TCP_ERR, s); DBG_TRACE_DEVEL("leaving on error", STRM_EV_STRM_ANA|STRM_EV_TCP_ANA|STRM _EV_TCP_ERR, s);
return 0; return 0;
} }
/* This function performs the TCP layer4 analysis on the current request. It /* This function performs the TCP layer4 analysis on the current request. It
 End of changes. 2 change blocks. 
2 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)