From: Thierry Fournier <thierry.fournier@ozon.io>
Date: Sat, 28 Nov 2020 16:40:24 +0000 (+0100)
Subject: MINOR: actions: Export actions lookup functions
X-Git-Tag: v2.4-dev3~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a71a6d9d262d7a0f7c3d208ab339d469958011d;p=thirdparty%2Fhaproxy.git

MINOR: actions: Export actions lookup functions

These functions will be useful to check if a keyword is already registered.
This will be needed by a next patch to fix a bug, and will need to be
backported.
---

diff --git a/include/haproxy/http_rules.h b/include/haproxy/http_rules.h
index 55788bd919..159abb8556 100644
--- a/include/haproxy/http_rules.h
+++ b/include/haproxy/http_rules.h
@@ -52,6 +52,10 @@ static inline void http_after_res_keywords_register(struct action_kw_list *kw_li
 	LIST_ADDQ(&http_after_res_keywords.list, &kw_list->list);
 }
 
+struct action_kw *action_http_req_custom(const char *kw);
+struct action_kw *action_http_res_custom(const char *kw);
+struct action_kw *action_http_after_res_custom(const char *kw);
+
 #endif /* _HAPROXY_HTTP_RULES_H */
 
 /*
diff --git a/include/haproxy/tcp_rules.h b/include/haproxy/tcp_rules.h
index 57073f49a0..2ed515e607 100644
--- a/include/haproxy/tcp_rules.h
+++ b/include/haproxy/tcp_rules.h
@@ -37,6 +37,11 @@ void tcp_req_sess_keywords_register(struct action_kw_list *kw_list);
 void tcp_req_cont_keywords_register(struct action_kw_list *kw_list);
 void tcp_res_cont_keywords_register(struct action_kw_list *kw_list);
 
+struct action_kw *tcp_req_conn_action(const char *kw);
+struct action_kw *tcp_req_sess_action(const char *kw);
+struct action_kw *tcp_req_cont_action(const char *kw);
+struct action_kw *tcp_res_cont_action(const char *kw);
+
 #endif /* _HAPROXY_TCP_RULES_H */
 
 /*
diff --git a/src/http_rules.c b/src/http_rules.c
index 87d32f3777..2ac1fefc14 100644
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -51,7 +51,7 @@ struct action_kw_list http_after_res_keywords = {
 /*
  * Return the struct http_req_action_kw associated to a keyword.
  */
-static struct action_kw *action_http_req_custom(const char *kw)
+struct action_kw *action_http_req_custom(const char *kw)
 {
 	return action_lookup(&http_req_keywords.list, kw);
 }
@@ -59,7 +59,7 @@ static struct action_kw *action_http_req_custom(const char *kw)
 /*
  * Return the struct http_res_action_kw associated to a keyword.
  */
-static struct action_kw *action_http_res_custom(const char *kw)
+struct action_kw *action_http_res_custom(const char *kw)
 {
 	return action_lookup(&http_res_keywords.list, kw);
 }
@@ -67,7 +67,7 @@ static struct action_kw *action_http_res_custom(const char *kw)
 /*
  * Return the struct http_after_res_action_kw associated to a keyword.
  */
-static struct action_kw *action_http_after_res_custom(const char *kw)
+struct action_kw *action_http_after_res_custom(const char *kw)
 {
 	return action_lookup(&http_after_res_keywords.list, kw);
 }
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 6a31a32670..d5fce268bd 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -66,22 +66,22 @@ void tcp_res_cont_keywords_register(struct action_kw_list *kw_list)
 /*
  * Return the struct tcp_req_action_kw associated to a keyword.
  */
-static struct action_kw *tcp_req_conn_action(const char *kw)
+struct action_kw *tcp_req_conn_action(const char *kw)
 {
 	return action_lookup(&tcp_req_conn_keywords, kw);
 }
 
-static struct action_kw *tcp_req_sess_action(const char *kw)
+struct action_kw *tcp_req_sess_action(const char *kw)
 {
 	return action_lookup(&tcp_req_sess_keywords, kw);
 }
 
-static struct action_kw *tcp_req_cont_action(const char *kw)
+struct action_kw *tcp_req_cont_action(const char *kw)
 {
 	return action_lookup(&tcp_req_cont_keywords, kw);
 }
 
-static struct action_kw *tcp_res_cont_action(const char *kw)
+struct action_kw *tcp_res_cont_action(const char *kw)
 {
 	return action_lookup(&tcp_res_cont_keywords, kw);
 }