mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 22:31:06 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: actions: mutualise the action keyword lookup

Browse Source 
Each (http|tcp)-(request|response) action use the same method
for looking up the action keyword during the cofiguration parsing.

This patch mutualize the code.
This commit is contained in:
Thierry FOURNIER 2015-08-19 09:07:47 +02:00 committed by Willy Tarreau
parent c2bb050f7f
commit 322a124867
4 changed files with 55 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
include/proto/action.h Normal file
View File

@ -0,0 +1,47 @@
/*
* include/proto/action.h
* This file contains actions prototypes.
*
* Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, version 2.1
* exclusively.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_ACTION_H
#define _PROTO_ACTION_H
#include <types/action.h>
static inline struct action_kw *action_lookup(struct list *keywords, const char *kw)
{
struct action_kw_list *kw_list;
int i;
if (LIST_ISEMPTY(keywords))
return NULL;
list_for_each_entry(kw_list, keywords, list) {
for (i = 0; kw_list->kw[i].kw != NULL; i++) {
if (kw_list->kw[i].match_pfx &&
strncmp(kw, kw_list->kw[i].kw, strlen(kw_list->kw[i].kw)) == 0)
return &kw_list->kw[i];
if (!strcmp(kw, kw_list->kw[i].kw))
return &kw_list->kw[i];
}
}
return NULL;
}
#endif /* _PROTO_ACTION_H */

2
include/types/action.h
View File

@ -1,6 +1,6 @@
/*
* include/types/action.h
* This file contains TCP protocol definitions.
* This file contains actions definitions.
*
* Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
*

33
src/proto_http.c
View File

@ -42,6 +42,7 @@
#include <types/global.h>
#include <proto/acl.h>
#include <proto/action.h>
#include <proto/arg.h>
#include <proto/auth.h>
#include <proto/backend.h>
@ -12647,21 +12648,7 @@ int parse_http_res_capture(const char **args, int *orig_arg, struct proxy *px, s
*/
struct action_kw *action_http_req_custom(const char *kw)
{
if (!LIST_ISEMPTY(&http_req_keywords.list)) {
struct action_kw_list *kw_list;
int i;
list_for_each_entry(kw_list, &http_req_keywords.list, list) {
for (i = 0; kw_list->kw[i].kw != NULL; i++) {
if (kw_list->kw[i].match_pfx &&
strncmp(kw, kw_list->kw[i].kw, strlen(kw_list->kw[i].kw)) == 0)
return &kw_list->kw[i];
if (!strcmp(kw, kw_list->kw[i].kw))
return &kw_list->kw[i];
}
}
}
return NULL;
return action_lookup(&http_req_keywords.list, kw);
}
/*
@ -12669,21 +12656,7 @@ struct action_kw *action_http_req_custom(const char *kw)
*/
struct action_kw *action_http_res_custom(const char *kw)
{
if (!LIST_ISEMPTY(&http_res_keywords.list)) {
struct action_kw_list *kw_list;
int i;
list_for_each_entry(kw_list, &http_res_keywords.list, list) {
for (i = 0; kw_list->kw[i].kw != NULL; i++) {
if (kw_list->kw[i].match_pfx &&
strncmp(kw, kw_list->kw[i].kw, strlen(kw_list->kw[i].kw)) == 0)
return &kw_list->kw[i];
if (!strcmp(kw, kw_list->kw[i].kw))
return &kw_list->kw[i];
}
}
}
return NULL;
return action_lookup(&http_res_keywords.list, kw);
}
/************************************************************************/

52
src/proto_tcp.c
View File

@ -40,6 +40,7 @@
#include <types/server.h>
#include <proto/acl.h>
#include <proto/action.h>
#include <proto/arg.h>
#include <proto/channel.h>
#include <proto/connection.h>
@ -137,62 +138,17 @@ void tcp_res_cont_keywords_register(struct action_kw_list *kw_list)
*/
static struct action_kw *tcp_req_conn_action(const char *kw)
{
struct action_kw_list *kw_list;
int i;
if (LIST_ISEMPTY(&tcp_req_conn_keywords))
return NULL;
list_for_each_entry(kw_list, &tcp_req_conn_keywords, list) {
for (i = 0; kw_list->kw[i].kw != NULL; i++) {
if (kw_list->kw[i].match_pfx &&
strncmp(kw, kw_list->kw[i].kw, strlen(kw_list->kw[i].kw)) == 0)
return &kw_list->kw[i];
if (!strcmp(kw, kw_list->kw[i].kw))
return &kw_list->kw[i];
}
}
return NULL;
return action_lookup(&tcp_req_conn_keywords, kw);
}
static struct action_kw *tcp_req_cont_action(const char *kw)
{
struct action_kw_list *kw_list;
int i;
if (LIST_ISEMPTY(&tcp_req_cont_keywords))
return NULL;
list_for_each_entry(kw_list, &tcp_req_cont_keywords, list) {
for (i = 0; kw_list->kw[i].kw != NULL; i++) {
if (kw_list->kw[i].match_pfx &&
strncmp(kw, kw_list->kw[i].kw, strlen(kw_list->kw[i].kw)) == 0)
return &kw_list->kw[i];
if (!strcmp(kw, kw_list->kw[i].kw))
return &kw_list->kw[i];
}
}
return NULL;
return action_lookup(&tcp_req_cont_keywords, kw);
}
static struct action_kw *tcp_res_cont_action(const char *kw)
{
struct action_kw_list *kw_list;
int i;
if (LIST_ISEMPTY(&tcp_res_cont_keywords))
return NULL;
list_for_each_entry(kw_list, &tcp_res_cont_keywords, list) {
for (i = 0; kw_list->kw[i].kw != NULL; i++) {
if (kw_list->kw[i].match_pfx &&
strncmp(kw, kw_list->kw[i].kw, strlen(kw_list->kw[i].kw)) == 0)
return &kw_list->kw[i];
if (!strcmp(kw, kw_list->kw[i].kw))
return &kw_list->kw[i];
}
}
return NULL;
return action_lookup(&tcp_res_cont_keywords, kw);
}
/* Binds ipv4/ipv6 address <local> to socket <fd>, unless <flags> is set, in which