mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 14:50:59 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: use direction names in place of numeric values

Browse Source 
This patch cleanups the direction names. It replaces numeric values,
by the associated defines. It ensure the compliance with values found
somwhere else in HAProxy.

It is required by the bugfix patch which is following.
[wt: needs to be backported to 1.6]
This commit is contained in:
Thierry FOURNIER 2015-11-02 09:52:54 +01:00 committed by Willy Tarreau
parent a315c5534e
commit 6e01f38e73
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/hlua.c
View File

@ -2450,31 +2450,32 @@ __LJMP static int hlua_socket_new(lua_State *L)
* action not revalidate the request and not send a 400 if the modified * action not revalidate the request and not send a 400 if the modified
* resuest is not valid. * resuest is not valid.
* *
* This function never fails. If dir is 0 we are a request, if it is 1 * This function never fails. The direction is set using dir, which equals
* its a response. * either SMP_OPT_DIR_REQ or SMP_OPT_DIR_RES.
*/ */
static void hlua_resynchonize_proto(struct stream *stream, int dir) static void hlua_resynchonize_proto(struct stream *stream, int dir)
{ {
/* Protocol HTTP. */ /* Protocol HTTP. */
if (stream->be->mode == PR_MODE_HTTP) { if (stream->be->mode == PR_MODE_HTTP) {
if (dir == 0) if (dir == SMP_OPT_DIR_REQ)
http_txn_reset_req(stream->txn); http_txn_reset_req(stream->txn);
else if (dir == 1) else if (dir == SMP_OPT_DIR_RES)
http_txn_reset_res(stream->txn); http_txn_reset_res(stream->txn);
if (stream->txn->hdr_idx.v) if (stream->txn->hdr_idx.v)
hdr_idx_init(&stream->txn->hdr_idx); hdr_idx_init(&stream->txn->hdr_idx);
if (dir == 0) if (dir == SMP_OPT_DIR_REQ)
http_msg_analyzer(&stream->txn->req, &stream->txn->hdr_idx); http_msg_analyzer(&stream->txn->req, &stream->txn->hdr_idx);
else if (dir == 1) else if (dir == SMP_OPT_DIR_RES)
http_msg_analyzer(&stream->txn->rsp, &stream->txn->hdr_idx); http_msg_analyzer(&stream->txn->rsp, &stream->txn->hdr_idx);
} }
} }
/* Check the protocole integrity after the Lua manipulations. /* Check the protocole integrity after the Lua manipulations. Close the stream
* Close the stream and returns 0 if fails, otherwise returns 1. * and returns 0 if fails, otherwise returns 1. The direction is set using dir,
* which equals either SMP_OPT_DIR_REQ or SMP_OPT_DIR_RES.
*/ */
static int hlua_check_proto(struct stream *stream, int dir) static int hlua_check_proto(struct stream *stream, int dir)
{ {
@ -2487,13 +2488,13 @@ static int hlua_check_proto(struct stream *stream, int dir)
* if the parser is still expected to run or not. * if the parser is still expected to run or not.
*/ */
if (stream->be->mode == PR_MODE_HTTP) { if (stream->be->mode == PR_MODE_HTTP) {
if (dir == 0 && if (dir == SMP_OPT_DIR_REQ &&
!(stream->req.analysers & AN_REQ_WAIT_HTTP) && !(stream->req.analysers & AN_REQ_WAIT_HTTP) &&
stream->txn->req.msg_state < HTTP_MSG_BODY) { stream->txn->req.msg_state < HTTP_MSG_BODY) {
stream_int_retnclose(&stream->si[0], &msg); stream_int_retnclose(&stream->si[0], &msg);
return 0; return 0;
} }
else if (dir == 1 && else if (dir == SMP_OPT_DIR_RES &&
!(stream->res.analysers & AN_RES_WAIT_HTTP) && !(stream->res.analysers & AN_RES_WAIT_HTTP) &&
stream->txn->rsp.msg_state < HTTP_MSG_BODY) { stream->txn->rsp.msg_state < HTTP_MSG_BODY) {
stream_int_retnclose(&stream->si[0], &msg); stream_int_retnclose(&stream->si[0], &msg);
@ -5439,10 +5440,10 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
int dir; int dir;
switch (rule->from) { switch (rule->from) {
case ACT_F_TCP_REQ_CNT: analyzer = AN_REQ_INSPECT_FE ; dir = 0; break; case ACT_F_TCP_REQ_CNT: analyzer = AN_REQ_INSPECT_FE ; dir = SMP_OPT_DIR_REQ; break;
case ACT_F_TCP_RES_CNT: analyzer = AN_RES_INSPECT ; dir = 1; break; case ACT_F_TCP_RES_CNT: analyzer = AN_RES_INSPECT ; dir = SMP_OPT_DIR_RES; break;
case ACT_F_HTTP_REQ: analyzer = AN_REQ_HTTP_PROCESS_FE; dir = 0; break; case ACT_F_HTTP_REQ: analyzer = AN_REQ_HTTP_PROCESS_FE; dir = SMP_OPT_DIR_REQ; break;
case ACT_F_HTTP_RES: analyzer = AN_RES_HTTP_PROCESS_BE; dir = 1; break; case ACT_F_HTTP_RES: analyzer = AN_RES_HTTP_PROCESS_BE; dir = SMP_OPT_DIR_RES; break;
default: default:
SEND_ERR(px, "Lua: internal error while execute action.\n"); SEND_ERR(px, "Lua: internal error while execute action.\n");
return ACT_RET_CONT; return ACT_RET_CONT;