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

CLEANUP: include: move sample_data out of sample-t.h

Browse Source 
The struct sample_data is used by pattern, map and vars, and currently
requires to include sample-t which comes with many other dependencies.
Let's move sample_data into its own file to shorten the dependency tree.
This revealed a number of issues in adjacent files which were hidden by
the fact that sample-t.h brought everything that was missing.
This commit is contained in:
Willy Tarreau 2020-06-05 16:54:16 +02:00
parent 4f663ec022
commit 251c2aae06
6 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/haproxy/acl-t.h
View File

@ -22,14 +22,9 @@
#ifndef _HAPROXY_ACL_T_H
#define _HAPROXY_ACL_T_H
#include <import/ebmbtree.h>
#include <haproxy/arg-t.h>
#include <haproxy/list-t.h>
#include <haproxy/pattern-t.h>
#include <haproxy/server-t.h>
#include <haproxy/api-t.h>
#include <haproxy/sample-t.h>
/* ACL test result.
*

6
include/haproxy/pattern-t.h
View File

@ -29,7 +29,7 @@
#include <haproxy/thread-t.h>
#include <haproxy/api-t.h>
#include <haproxy/sample-t.h>
#include <haproxy/sample_data-t.h>
/* Pattern matching function result.
@ -206,7 +206,9 @@ struct pattern_expr_list {
struct pattern_expr *expr; /* The used expr. */
};
/* This struct contain a list of pattern expr */
/* This struct contains a list of pattern expr */
struct sample;
struct pattern_head {
int (*parse)(const char *text, struct pattern *pattern, int flags, char **err);
int (*parse_smp)(const char *text, struct sample_data *data);

1
include/haproxy/pattern.h
View File

@ -26,6 +26,7 @@
#include <haproxy/api.h>
#include <haproxy/pattern-t.h>
#include <haproxy/sample-t.h>
/* pattern management function arrays */
extern char *pat_match_names[PAT_MATCH_NUM];

28
include/haproxy/sample-t.h
View File

@ -23,13 +23,9 @@
#ifndef _HAPROXY_SAMPLE_T_H
#define _HAPROXY_SAMPLE_T_H
#include <sys/socket.h>
#include <netinet/in.h>
#include <haproxy/api-t.h>
#include <haproxy/buf-t.h>
#include <haproxy/http-t.h>
#include <haproxy/list-t.h>
#include <haproxy/api-t.h>
#include <haproxy/sample_data-t.h>
/* input and output sample types */
enum {
@ -225,26 +221,6 @@ union smp_ctx {
void *a[8]; /* any array of up to 8 pointers */
};
/* Note: the strings below make use of chunks. Chunks may carry an allocated
* size in addition to the length. The size counts from the beginning (str)
* to the end. If the size is unknown, it MUST be zero, in which case the
* sample will automatically be duplicated when a change larger than <len> has
* to be performed. Thus it is safe to always set size to zero.
*/
union sample_value {
long long int sint; /* used for signed 64bits integers */
struct in_addr ipv4; /* used for ipv4 addresses */
struct in6_addr ipv6; /* used for ipv6 addresses */
struct buffer str; /* used for char strings or buffers */
struct http_meth meth; /* used for http method */
};
/* Used to store sample constant */
struct sample_data {
int type; /* SMP_T_* */
union sample_value u; /* sample data */
};
/* a sample is a typed data extracted from a stream. It has a type, contents,
* validity constraints, a context for use in iterative calls.
*/

51
include/haproxy/sample_data-t.h Normal file
View File

@ -0,0 +1,51 @@
/*
* include/haproxy/sample_data-t.h
* Definitions of sample data
*
* Copyright (C) 2009-2010 EXCELIANCE, Emeric Brun <ebrun@exceliance.fr>
* Copyright (C) 2020 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 _HAPROXY_SAMPLE_DATA_T_H
#define _HAPROXY_SAMPLE_DATA_T_H
#include <sys/socket.h>
#include <netinet/in.h>
#include <haproxy/buf-t.h>
#include <haproxy/http-t.h>
/* Note: the strings below make use of chunks. Chunks may carry an allocated
* size in addition to the length. The size counts from the beginning (str)
* to the end. If the size is unknown, it MUST be zero, in which case the
* sample will automatically be duplicated when a change larger than <len> has
* to be performed. Thus it is safe to always set size to zero.
*/
union sample_value {
long long int sint; /* used for signed 64bits integers */
struct in_addr ipv4; /* used for ipv4 addresses */
struct in6_addr ipv6; /* used for ipv6 addresses */
struct buffer str; /* used for char strings or buffers */
struct http_meth meth; /* used for http method */
};
/* Used to store sample constant */
struct sample_data {
int type; /* SMP_T_* */
union sample_value u; /* sample data */
};
#endif /* _HAPROXY_SAMPLE_DATA_T_H */

2
include/haproxy/vars-t.h
View File

@ -23,7 +23,7 @@
#define _HAPROXY_VARS_T_H
#include <haproxy/list-t.h>
#include <haproxy/sample-t.h>
#include <haproxy/sample_data-t.h>
#include <haproxy/thread-t.h>
enum vars_scope {