RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-20 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: tcp: stop exporting smp_fetch_src()

Browse Source 
This is totally ugly, smp_fetch_src() is exported only so that stick_table.c
can (ab)use it in the {sc,src}_* sample fetch functions. It could be argued
that the sample could have been reconstructed there in place, but we don't
even need to duplicate the code. We'd rather simply retrieve the "src"
fetch's function from where it's used at init time and be done with it.
This commit is contained in:
Willy Tarreau 2020-08-28 11:31:31 +02:00
parent aeae66cf22
commit 478331dd93
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/haproxy/proto_tcp.h
View File

@ -35,9 +35,6 @@ int tcp_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir);
int tcp_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir);
int tcp_is_foreign(int fd, sa_family_t family);
/* Export some samples. */
int smp_fetch_src(const struct arg *args, struct sample *smp, const char *kw, void *private);
#endif /* _HAPROXY_PROTO_TCP_H */
/*

3
src/proto_tcp.c
View File

@ -1211,7 +1211,8 @@ int tcp_pause_listener(struct listener *l)
/************************************************************************/
/* fetch the connection's source IPv4/IPv6 address */
int smp_fetch_src(const struct arg *args, struct sample *smp, const char *kw, void *private)
static int
smp_fetch_src(const struct arg *args, struct sample *smp, const char *kw, void *private)
{
struct connection *cli_conn = objt_conn(smp->sess->origin);

18
src/stick_table.c
View File

@ -45,6 +45,7 @@
/* structure used to return a table key built from a sample */
static THREAD_LOCAL struct stktable_key static_table_key;
static int (*smp_fetch_src)(const struct arg *, struct sample *, const char *, void *);
struct stktable *stktables_list;
struct eb_root stktable_by_name = EB_ROOT;
@ -2211,7 +2212,7 @@ smp_fetch_sc_stkctr(struct session *sess, struct stream *strm, const struct arg
smp.px = NULL;
smp.sess = sess;
smp.strm = strm;
if (!smp_fetch_src(NULL, &smp, NULL, NULL))
if (!smp_fetch_src || !smp_fetch_src(NULL, &smp, NULL, NULL))
return NULL;
/* Converts into key. */
@ -2276,7 +2277,7 @@ smp_create_src_stkctr(struct session *sess, struct stream *strm, const struct ar
smp.px = NULL;
smp.sess = sess;
smp.strm = strm;
if (!smp_fetch_src(NULL, &smp, NULL, NULL))
if (!smp_fetch_src || !smp_fetch_src(NULL, &smp, NULL, NULL))
return NULL;
/* Converts into key. */
@ -2808,7 +2809,7 @@ smp_fetch_src_updt_conn_cnt(const struct arg *args, struct sample *smp, const ch
return 0;
/* Fetch source address in a sample. */
if (!smp_fetch_src(NULL, smp, NULL, NULL))
if (!smp_fetch_src || !smp_fetch_src(NULL, smp, NULL, NULL))
return 0;
/* Converts into key. */
@ -3856,6 +3857,17 @@ static void cli_release_show_table(struct appctx *appctx)
}
}
static void stkt_late_init(void)
{
struct sample_fetch *f;
f = find_sample_fetch("src", strlen("src"));
if (f)
smp_fetch_src = f->process;
}
INITCALL0(STG_INIT, stkt_late_init);
/* register cli keywords */
static struct cli_kw_list cli_kws = {{ },{
{ { "clear", "table", NULL }, "clear table : remove an entry from a table", cli_parse_table_req, cli_io_handler_table, cli_release_show_table, (void *)STK_CLI_ACT_CLR },