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

MINOR: listener: implement bind_conf_find_by_name()

Browse Source 
Returns a pointer to the first bind_conf matching <name> in a frontend
<front>.

When name is prefixed by a @ (@<filename>:<linenum>), it tries to look
for the corresponding filename and line of the configuration file.

NULL is returned if no match is found.
This commit is contained in:
William Lallemand 2025-10-29 11:43:33 +01:00
parent 23f5cbb411
commit 1e2f920be6
2 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/listener.h
View File

@ -258,6 +258,12 @@ static inline uint accept_queue_ring_len(const struct accept_queue_ring *ring)
return len;
}
/* Returns a pointer to the first bind_conf matching either name <name>, or
* filename:linenum in <name> if <name> begins with a '@'. NULL is returned if
* no match is found.
*/
struct bind_conf *bind_conf_find_by_name(struct proxy *front, const char *name);
#endif /* _HAPROXY_LISTENER_H */
/*

59
src/listener.c
View File

@ -16,6 +16,8 @@
#include <string.h>
#include <unistd.h>
#include <import/ist.h>
#include <haproxy/acl.h>
#include <haproxy/api.h>
#include <haproxy/activity.h>
@ -1944,6 +1946,63 @@ int bind_generate_guid(struct bind_conf *bind_conf)
return 0;
}
/* Returns a pointer to the first bind_conf matching either name <name>, or
* filename:linenum <name> if <name> begins with a '@'. NULL is returned if no
* match is found.
*/
struct bind_conf *bind_conf_find_by_name(struct proxy *front, const char *name)
{
struct bind_conf *bind_conf = NULL;
int linenum = -1;
struct ist filename = IST_NULL;
if (*name == '@') {
/* handle @filename:linenum */
char *endptr = NULL;
const char *p = name + 1;
filename.ptr = (char *)p;
while (*p != '\0' && *p != ':')
p++;
filename.len = p - filename.ptr;
if (*p)
p++;
linenum = strtol(p, &endptr, 10);
if (*endptr != '\0' || endptr == p) {
linenum = -1;
/* parsing error */
}
/* we're not using name for the next steps */
name = NULL;
}
/* loop on binds */
list_for_each_entry(bind_conf, &front->conf.bind, by_fe) {
/* if we are using a name, look at the name of the first listener,
* because bind_parse_name() sets the name on all listeners */
if (name) {
struct listener *l;
list_for_each_entry(l, &bind_conf->listeners, by_bind) {
if (l->name && strcmp(l->name, name) == 0)
return bind_conf;
/* we just need the first one */
break;
}
} else {
if ((strncmp(bind_conf->file, filename.ptr, filename.len) == 0)
&& bind_conf->line == linenum)
return bind_conf;
}
}
return NULL;
}
/*
* Registers the bind keyword list <kwl> as a list of valid keywords for next
* parsing sessions.