Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.2
haproxy
0005-BUG-MEDIUM-stick-tables-fix-breakage-in-ta...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0005-BUG-MEDIUM-stick-tables-fix-breakage-in-table-conver.patch of Package haproxy
From 5a009af68013ac3f08fd08dad27b5d8ad038724c Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w@1wt.eu> Date: Wed, 25 May 2016 17:07:56 +0200 Subject: [PATCH 05/14] BUG/MEDIUM: stick-tables: fix breakage in table converters Baptiste reported that the table_conn_rate() converter would always return zero in 1.6.5. In fact, commit bc8c404 ("MAJOR: stick-tables: use sample types in place of dedicated types") broke all stick-table converters because smp_to_stkey() now returns a pointer to the sample instead of holding a copy of the key, and the converters used to reinitialize the sample prior to performing the lookup. Only "in_table()" continued to work. The construct is still fragile, so some comments were added to a few function to clarify their impacts. It's also worth noting that there is no point anymore in forcing these converters to take a string on input, but that will be changed in another commit. The bug was introduced in 1.6-dev4, this fix must be backported to 1.6. (cherry picked from commit f0c730a0ac21a64af666ffa32a336db2c6f56d1b) --- src/stick_table.c | 56 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/src/stick_table.c b/src/stick_table.c index e5bb168..3e816b2 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -461,6 +461,8 @@ int stktable_parse_type(char **args, int *myidx, unsigned long *type, size_t *ke } /* Prepares a stktable_key from a sample <smp> to search into table <t>. + * Note that the sample *is* modified and that the returned key may point + * to it, so the sample must not be modified afterwards before the lookup. * Returns NULL if the sample could not be converted (eg: no matching type), * otherwise a pointer to the static stktable_key filled with what is needed * for the lookup. @@ -700,11 +702,12 @@ static int sample_conv_table_bytes_in_rate(const struct arg *arg_p, struct sampl if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -736,11 +739,12 @@ static int sample_conv_table_conn_cnt(const struct arg *arg_p, struct sample *sm if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -771,11 +775,12 @@ static int sample_conv_table_conn_cur(const struct arg *arg_p, struct sample *sm if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -806,11 +811,12 @@ static int sample_conv_table_conn_rate(const struct arg *arg_p, struct sample *s if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -842,11 +848,12 @@ static int sample_conv_table_bytes_out_rate(const struct arg *arg_p, struct samp if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -878,11 +885,12 @@ static int sample_conv_table_gpt0(const struct arg *arg_p, struct sample *smp, v if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -913,11 +921,12 @@ static int sample_conv_table_gpc0(const struct arg *arg_p, struct sample *smp, v if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -948,11 +957,12 @@ static int sample_conv_table_gpc0_rate(const struct arg *arg_p, struct sample *s if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -984,11 +994,12 @@ static int sample_conv_table_http_err_cnt(const struct arg *arg_p, struct sample if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1019,11 +1030,12 @@ static int sample_conv_table_http_err_rate(const struct arg *arg_p, struct sampl if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1055,11 +1067,12 @@ static int sample_conv_table_http_req_cnt(const struct arg *arg_p, struct sample if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1090,11 +1103,12 @@ static int sample_conv_table_http_req_rate(const struct arg *arg_p, struct sampl if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1126,11 +1140,12 @@ static int sample_conv_table_kbytes_in(const struct arg *arg_p, struct sample *s if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1161,11 +1176,12 @@ static int sample_conv_table_kbytes_out(const struct arg *arg_p, struct sample * if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1196,11 +1212,12 @@ static int sample_conv_table_server_id(const struct arg *arg_p, struct sample *s if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1231,11 +1248,12 @@ static int sample_conv_table_sess_cnt(const struct arg *arg_p, struct sample *sm if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1266,11 +1284,12 @@ static int sample_conv_table_sess_rate(const struct arg *arg_p, struct sample *s if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (!ts) /* key not present */ return 1; @@ -1301,11 +1320,12 @@ static int sample_conv_table_trackers(const struct arg *arg_p, struct sample *sm if (!key) return 0; + ts = stktable_lookup_key(t, key); + smp->flags = SMP_F_VOL_TEST; smp->data.type = SMP_T_SINT; smp->data.u.sint = 0; - ts = stktable_lookup_key(t, key); if (ts) smp->data.u.sint = ts->ref_cnt; -- 2.6.6
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
