mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-03-06 15:41:36 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: protocols: register the ->add function and stop calling them directly

Browse Source 
cfgparse has no business directly calling each individual protocol's 'add'
function to create a listener. Now that they're all registered, better
perform a protocol lookup on the family and have a standard ->add method
for all of them.
This commit is contained in:
Willy Tarreau 2017-09-15 07:55:51 +02:00
parent 3228238c73
commit 9d5be5c823
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/proto_tcp.h
View File

@ -28,8 +28,6 @@
#include <proto/stick_table.h>
int tcp_bind_socket(int fd, int flags, struct sockaddr_storage *local, struct sockaddr_storage *remote);
void tcpv4_add_listener(struct listener *listener, int port);
void tcpv6_add_listener(struct listener *listener, int port);
int tcp_pause_listener(struct listener *l);
int tcp_connect_server(struct connection *conn, int data, int delack);
int tcp_connect_probe(struct connection *conn);

1
include/proto/proto_uxst.h
View File

@ -26,7 +26,6 @@
#include <types/stream.h>
#include <types/task.h>
void uxst_add_listener(struct listener *listener, int port);
int uxst_pause_listener(struct listener *l);
int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir);
int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir);

1
include/types/protocol.h
View File

@ -61,6 +61,7 @@ struct protocol {
int (*get_dst)(int fd, struct sockaddr *, socklen_t, int dir); /* syscall used to retrieve dst addr */
int (*drain)(int fd); /* indicates whether we can safely close the fd */
int (*pause)(struct listener *l); /* temporarily pause this listener for a soft restart */
void (*add)(struct listener *l, int port); /* add a listener for this protocol and port */
struct list listeners; /* list of listeners using this protocol */
int nb_listeners; /* number of listeners */

19
src/cfgparse.c
View File

@ -72,8 +72,6 @@
#include <proto/listener.h>
#include <proto/log.h>
#include <proto/protocol.h>
#include <proto/proto_tcp.h>
#include <proto/proto_uxst.h>
#include <proto/proto_http.h>
#include <proto/proxy.h>
#include <proto/peers.h>
@ -288,6 +286,13 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf,
memcpy(&ss, ss2, sizeof(ss));
for (; port <= end; port++) {
struct protocol *proto = protocol_by_family(ss.ss_family);
if (!proto) {
memprintf(err, "unsupported protocol family %d for address '%s'.\n", ss.ss_family, str);
goto fail;
}
l = calloc(1, sizeof(*l));
l->obj_type = OBJ_TYPE_LISTENER;
LIST_ADDQ(&curproxy->conf.listeners, &l->by_fe);
@ -298,15 +303,7 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf,
memcpy(&l->addr, &ss, sizeof(ss));
l->state = LI_INIT;
if (ss.ss_family == AF_INET) {
tcpv4_add_listener(l, port);
}
else if (ss.ss_family == AF_INET6) {
tcpv6_add_listener(l, port);
}
else {
uxst_add_listener(l, port);
}
proto->add(l, port);
jobs++;
listeners++;

8
src/proto_tcp.c
View File

@ -63,6 +63,8 @@
static int tcp_bind_listeners(struct protocol *proto, char *errmsg, int errlen);
static int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen);
static void tcpv4_add_listener(struct listener *listener, int port);
static void tcpv6_add_listener(struct listener *listener, int port);
/* Note: must not be declared <const> as its list will be overwritten */
static struct protocol proto_tcpv4 = {
@ -83,6 +85,7 @@ static struct protocol proto_tcpv4 = {
.get_dst = tcp_get_dst,
.drain = tcp_drain,
.pause = tcp_pause_listener,
.add = tcpv4_add_listener,
.listeners = LIST_HEAD_INIT(proto_tcpv4.listeners),
.nb_listeners = 0,
};
@ -106,6 +109,7 @@ static struct protocol proto_tcpv6 = {
.get_dst = tcp_get_dst,
.drain = tcp_drain,
.pause = tcp_pause_listener,
.add = tcpv6_add_listener,
.listeners = LIST_HEAD_INIT(proto_tcpv6.listeners),
.nb_listeners = 0,
};
@ -1141,7 +1145,7 @@ static int tcp_bind_listeners(struct protocol *proto, char *errmsg, int errlen)
* listener's state is automatically updated from LI_INIT to LI_ASSIGNED.
* The number of listeners for the protocol is updated.
*/
void tcpv4_add_listener(struct listener *listener, int port)
static void tcpv4_add_listener(struct listener *listener, int port)
{
if (listener->state != LI_INIT)
return;
@ -1156,7 +1160,7 @@ void tcpv4_add_listener(struct listener *listener, int port)
* listener's state is automatically updated from LI_INIT to LI_ASSIGNED.
* The number of listeners for the protocol is updated.
*/
void tcpv6_add_listener(struct listener *listener, int port)
static void tcpv6_add_listener(struct listener *listener, int port)
{
if (listener->state != LI_INIT)
return;

4
src/proto_uxst.c
View File

@ -49,6 +49,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
static int uxst_bind_listeners(struct protocol *proto, char *errmsg, int errlen);
static int uxst_unbind_listeners(struct protocol *proto);
static int uxst_connect_server(struct connection *conn, int data, int delack);
static void uxst_add_listener(struct listener *listener, int port);
/* Note: must not be declared <const> as its list will be overwritten */
static struct protocol proto_unix = {
@ -69,6 +70,7 @@ static struct protocol proto_unix = {
.get_src = uxst_get_src,
.get_dst = uxst_get_dst,
.pause = uxst_pause_listener,
.add = uxst_add_listener,
.listeners = LIST_HEAD_INIT(proto_unix.listeners),
.nb_listeners = 0,
};
@ -369,7 +371,7 @@ static int uxst_unbind_listener(struct listener *listener)
* listener's state is automatically updated from LI_INIT to LI_ASSIGNED.
* The number of listeners for the protocol is updated.
*/
void uxst_add_listener(struct listener *listener, int port)
static void uxst_add_listener(struct listener *listener, int port)
{
if (listener->state != LI_INIT)
return;