RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MAJOR: spoe: Fix initialization of thread-dependent fields

Browse Source 
A bug was introduced in the commit b0769b ("BUG/MEDIUM: spoe: initialization
depending on nbthread must be done last"). The code depending on global.nbthread
was moved from cfg_parse_spoe_agent() to spoe_check() but the pointer on the
agent configuration was not updated to use the filter's one. The variable
curagent is a global variable only valid during the configuration parsing. In
spoe_check(), conf->agent must be used instead.

This patch must be backported to 1.9 and 1.8.
This commit is contained in:
Christopher Faulet 2019-03-18 13:57:42 +01:00
parent c6c37b2d46
commit fe261551b9
1 changed files with 7 additions and 7 deletions

14
src/flt_spoe.c
View File

@ -3082,18 +3082,18 @@ spoe_check(struct proxy *px, struct flt_conf *fconf)
if (global.nbthread == 1)
conf->agent->flags |= SPOE_FL_ASYNC;
if ((curagent->rt = calloc(global.nbthread, sizeof(*curagent->rt))) == NULL) {
if ((conf->agent->rt = calloc(global.nbthread, sizeof(*conf->agent->rt))) == NULL) {
ha_alert("Proxy %s : out of memory initializing SPOE agent '%s' declared at %s:%d.\n",
px->id, conf->agent->id, conf->agent->conf.file, conf->agent->conf.line);
return 1;
}
for (i = 0; i < global.nbthread; ++i) {
curagent->rt[i].frame_size = curagent->max_frame_size;
curagent->rt[i].processing = 0;
LIST_INIT(&curagent->rt[i].applets);
LIST_INIT(&curagent->rt[i].sending_queue);
LIST_INIT(&curagent->rt[i].waiting_queue);
HA_SPIN_INIT(&curagent->rt[i].lock);
conf->agent->rt[i].frame_size = conf->agent->max_frame_size;
conf->agent->rt[i].processing = 0;
LIST_INIT(&conf->agent->rt[i].applets);
LIST_INIT(&conf->agent->rt[i].sending_queue);
LIST_INIT(&conf->agent->rt[i].waiting_queue);
HA_SPIN_INIT(&conf->agent->rt[i].lock);
}
free(conf->agent->b.name);