mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: proxy: make findproxy() use trees to look up proxies

Browse Source 
Both proxy IDs and names are now looked up from the trees.
This commit is contained in:
Willy Tarreau 2014-03-15 07:43:51 +01:00
parent f79d950163
commit cfd837fb6c
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/proxy.c
View File

@ -25,6 +25,9 @@
#include <common/memory.h> #include <common/memory.h>
#include <common/time.h> #include <common/time.h>
#include <eb32tree.h>
#include <ebistree.h>
#include <types/global.h> #include <types/global.h>
#include <types/obj_type.h> #include <types/obj_type.h>
#include <types/peers.h> #include <types/peers.h>
@ -339,23 +342,44 @@ struct proxy *findproxy(const char *name, int cap) {
struct proxy *curproxy, *target = NULL; struct proxy *curproxy, *target = NULL;
int pid = -1; int pid = -1;
if (*name == '#') if (*name == '#') {
struct eb32_node *node;
pid = atoi(name + 1); pid = atoi(name + 1);
for (curproxy = proxy; curproxy; curproxy = curproxy->next) { for (node = eb32_lookup(&used_proxy_id, pid); node; node = eb32_next(node)) {
if ((curproxy->cap & cap) != cap || curproxy = container_of(node, struct proxy, conf.id);
(pid >= 0 && curproxy->uuid != pid) ||
(pid < 0 && strcmp(curproxy->id, name))) if (curproxy->uuid != pid)
continue; break;
if ((curproxy->cap & cap) != cap)
continue;
if (target)
return NULL;
if (!target) {
target = curproxy; target = curproxy;
continue;
} }
return NULL;
} }
else {
struct ebpt_node *node;
for (node = ebis_lookup(&proxy_by_name, name); node; node = ebpt_next(node)) {
curproxy = container_of(node, struct proxy, conf.by_name);
if (strcmp(curproxy->id, name) != 0)
break;
if ((curproxy->cap & cap) != cap)
continue;
if (target)
return NULL;
target = curproxy;
}
}
return target; return target;
} }