From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 25 Jun 2021 13:18:33 +0000 (+0200)
Subject: CLEANUP: tcp-act: Sort action lists
X-Git-Tag: v2.5-dev1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee9c98d81bb8ffc1e07b07e0999ec778ed28666e;p=thirdparty%2Fhaproxy.git

CLEANUP: tcp-act: Sort action lists

Sort the lists used to register tcp actions.
---

diff --git a/src/tcp_act.c b/src/tcp_act.c
index cb6c75f403..ff521d2c2e 100644
--- a/src/tcp_act.c
+++ b/src/tcp_act.c
@@ -381,11 +381,11 @@ static enum act_parse_ret tcp_parse_silent_drop(const char **args, int *orig_arg
 
 
 static struct action_kw_list tcp_req_conn_actions = {ILH, {
+	{ "set-dst"     , tcp_parse_set_src_dst },
+	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-mark",     tcp_parse_set_mark    },
 	{ "set-src",      tcp_parse_set_src_dst },
 	{ "set-src-port", tcp_parse_set_src_dst },
-	{ "set-dst"     , tcp_parse_set_src_dst },
-	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-tos",      tcp_parse_set_tos     },
 	{ "silent-drop",  tcp_parse_silent_drop },
 	{ /* END */ }
@@ -394,11 +394,11 @@ static struct action_kw_list tcp_req_conn_actions = {ILH, {
 INITCALL1(STG_REGISTER, tcp_req_conn_keywords_register, &tcp_req_conn_actions);
 
 static struct action_kw_list tcp_req_sess_actions = {ILH, {
+	{ "set-dst"     , tcp_parse_set_src_dst },
+	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-mark",     tcp_parse_set_mark    },
 	{ "set-src",      tcp_parse_set_src_dst },
 	{ "set-src-port", tcp_parse_set_src_dst },
-	{ "set-dst"     , tcp_parse_set_src_dst },
-	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-tos",      tcp_parse_set_tos     },
 	{ "silent-drop",  tcp_parse_silent_drop },
 	{ /* END */ }
@@ -407,11 +407,11 @@ static struct action_kw_list tcp_req_sess_actions = {ILH, {
 INITCALL1(STG_REGISTER, tcp_req_sess_keywords_register, &tcp_req_sess_actions);
 
 static struct action_kw_list tcp_req_cont_actions = {ILH, {
+	{ "set-dst"     , tcp_parse_set_src_dst },
+	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-mark",     tcp_parse_set_mark    },
 	{ "set-src",      tcp_parse_set_src_dst },
 	{ "set-src-port", tcp_parse_set_src_dst },
-	{ "set-dst"     , tcp_parse_set_src_dst },
-	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-tos",      tcp_parse_set_tos     },
 	{ "silent-drop",  tcp_parse_silent_drop },
 	{ /* END */ }
@@ -429,13 +429,13 @@ static struct action_kw_list tcp_res_cont_actions = {ILH, {
 INITCALL1(STG_REGISTER, tcp_res_cont_keywords_register, &tcp_res_cont_actions);
 
 static struct action_kw_list http_req_actions = {ILH, {
+	{ "set-dst",      tcp_parse_set_src_dst },
+	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-mark",     tcp_parse_set_mark    },
-	{ "silent-drop",  tcp_parse_silent_drop },
 	{ "set-src",      tcp_parse_set_src_dst },
 	{ "set-src-port", tcp_parse_set_src_dst },
-	{ "set-dst",      tcp_parse_set_src_dst },
-	{ "set-dst-port", tcp_parse_set_src_dst },
 	{ "set-tos",      tcp_parse_set_tos     },
+	{ "silent-drop",  tcp_parse_silent_drop },
 	{ /* END */ }
 }};