From 233ad288cd4b855ba5fd08342433a0f5d20e625d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 15 Oct 2020 21:45:15 +0200 Subject: [PATCH] CLEANUP: protocol: remove the now unused field of proto_fam->bind() We don't need to specify the handler anymore since it's set in the receiver. Let's remove this argument from the function and clean up the remains of code that were still setting it. --- include/haproxy/proto_sockpair.h | 2 +- include/haproxy/protocol-t.h | 2 +- include/haproxy/sock_inet.h | 2 +- include/haproxy/sock_unix.h | 2 +- src/proto_sockpair.c | 16 ++++++++-------- src/protocol.c | 8 +------- src/sock_inet.c | 6 +++--- src/sock_unix.c | 12 ++++++------ 8 files changed, 22 insertions(+), 28 deletions(-) diff --git a/include/haproxy/proto_sockpair.h b/include/haproxy/proto_sockpair.h index 6807169a7..e012407d7 100644 --- a/include/haproxy/proto_sockpair.h +++ b/include/haproxy/proto_sockpair.h @@ -25,7 +25,7 @@ extern struct proto_fam proto_fam_sockpair; int recv_fd_uxst(int sock); int send_fd_uxst(int fd, int send_fd); -int sockpair_bind_receiver(struct receiver *rx, void (*handler)(int fd), char **errmsg); +int sockpair_bind_receiver(struct receiver *rx, char **errmsg); #endif /* _HAPROXY_PROTO_SOCKPAIR_H */ diff --git a/include/haproxy/protocol-t.h b/include/haproxy/protocol-t.h index d50c83882..1306a32a5 100644 --- a/include/haproxy/protocol-t.h +++ b/include/haproxy/protocol-t.h @@ -67,7 +67,7 @@ struct proto_fam { socklen_t sock_addrlen; /* socket address length, used by bind() */ int l3_addrlen; /* layer3 address length, used by hashes */ int (*addrcmp)(const struct sockaddr_storage *, const struct sockaddr_storage *); /* compare addresses (like memcmp) */ - int (*bind)(struct receiver *rx, void (*handler)(int fd), char **errmsg); /* bind a receiver */ + int (*bind)(struct receiver *rx, char **errmsg); /* bind a receiver */ int (*get_src)(int fd, struct sockaddr *, socklen_t, int dir); /* syscall used to retrieve src addr */ int (*get_dst)(int fd, struct sockaddr *, socklen_t, int dir); /* syscall used to retrieve dst addr */ }; diff --git a/include/haproxy/sock_inet.h b/include/haproxy/sock_inet.h index 7ecdc7b60..5829fcf31 100644 --- a/include/haproxy/sock_inet.h +++ b/include/haproxy/sock_inet.h @@ -40,6 +40,6 @@ int sock_inet_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir); int sock_inet_is_foreign(int fd, sa_family_t family); int sock_inet4_make_foreign(int fd); int sock_inet6_make_foreign(int fd); -int sock_inet_bind_receiver(struct receiver *rx, void (*handler)(int fd), char **errmsg); +int sock_inet_bind_receiver(struct receiver *rx, char **errmsg); #endif /* _HAPROXY_SOCK_INET_H */ diff --git a/include/haproxy/sock_unix.h b/include/haproxy/sock_unix.h index 3b46b4842..99343417e 100644 --- a/include/haproxy/sock_unix.h +++ b/include/haproxy/sock_unix.h @@ -31,6 +31,6 @@ extern struct proto_fam proto_fam_unix; int sock_unix_addrcmp(const struct sockaddr_storage *a, const struct sockaddr_storage *b); -int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char **errmsg); +int sock_unix_bind_receiver(struct receiver *rx, char **errmsg); #endif /* _HAPROXY_SOCK_UNIX_H */ diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c index 8e1746019..f8e673d0b 100644 --- a/src/proto_sockpair.c +++ b/src/proto_sockpair.c @@ -124,15 +124,15 @@ static void sockpair_disable_listener(struct listener *l) fd_stop_recv(l->rx.fd); } -/* Binds receiver , and assigns and rx->owner as the callback and - * context, respectively, with as the thread mask. Returns and error code - * made of ERR_* bits on failure or ERR_NONE on success. On failure, an error - * message may be passed into . Note that the binding address is only - * an FD to receive the incoming FDs on. Thus by definition there is no real - * "bind" operation, this only completes the receiver. Such FDs are not +/* Binds receiver , and assigns rx->iocb and rx->owner as the callback + * and context, respectively, with ->bind_thread as the thread mask. Returns an + * error code made of ERR_* bits on failure or ERR_NONE on success. On failure, + * an error message may be passed into . Note that the binding address + * is only an FD to receive the incoming FDs on. Thus by definition there is no + * real "bind" operation, this only completes the receiver. Such FDs are not * inherited upon reload. */ -int sockpair_bind_receiver(struct receiver *rx, void (*handler)(int fd), char **errmsg) +int sockpair_bind_receiver(struct receiver *rx, char **errmsg) { int err; @@ -165,7 +165,7 @@ int sockpair_bind_receiver(struct receiver *rx, void (*handler)(int fd), char ** rx->flags |= RX_F_BOUND; - fd_insert(rx->fd, rx->owner, handler, thread_mask(rx->settings->bind_thread) & all_threads_mask); + fd_insert(rx->fd, rx->owner, rx->iocb, thread_mask(rx->settings->bind_thread) & all_threads_mask); return err; bind_return: diff --git a/src/protocol.c b/src/protocol.c index 18ca40a0d..8ea36cb81 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -65,7 +65,6 @@ int protocol_bind_all(int verbose) struct receiver *receiver; char msg[100]; char *errmsg; - void *handler; int err, lerr; err = 0; @@ -74,12 +73,7 @@ int protocol_bind_all(int verbose) list_for_each_entry(receiver, &proto->receivers, proto_list) { listener = LIST_ELEM(receiver, struct listener *, rx); - /* FIXME: horrible hack, we don't have a way to register - * a handler when creating the receiver yet, so we still - * have to take care of special cases here. - */ - handler = listener->rx.iocb; - lerr = proto->fam->bind(receiver, handler, &errmsg); + lerr = proto->fam->bind(receiver, &errmsg); err |= lerr; /* errors are reported if is set or if they are fatal */ diff --git a/src/sock_inet.c b/src/sock_inet.c index 7a87fbea8..6675be583 100644 --- a/src/sock_inet.c +++ b/src/sock_inet.c @@ -252,12 +252,12 @@ int sock_inet6_make_foreign(int fd) 0; } -/* Binds receiver , and assigns and rx->owner as the callback and +/* Binds receiver , and assigns rx->iocb and rx->owner as the callback and * context, respectively. Returns and error code made of ERR_* bits on failure * or ERR_NONE on success. On failure, an error message may be passed into * . */ -int sock_inet_bind_receiver(struct receiver *rx, void (*handler)(int fd), char **errmsg) +int sock_inet_bind_receiver(struct receiver *rx, char **errmsg) { int fd, err, ext; /* copy listener addr because sometimes we need to switch family */ @@ -377,7 +377,7 @@ int sock_inet_bind_receiver(struct receiver *rx, void (*handler)(int fd), char * rx->fd = fd; rx->flags |= RX_F_BOUND; - fd_insert(fd, rx->owner, handler, thread_mask(rx->settings->bind_thread) & all_threads_mask); + fd_insert(fd, rx->owner, rx->iocb, thread_mask(rx->settings->bind_thread) & all_threads_mask); /* for now, all regularly bound TCP listeners are exportable */ if (!(rx->flags & RX_F_INHERITED)) diff --git a/src/sock_unix.c b/src/sock_unix.c index 2be8d6bfb..45631ac17 100644 --- a/src/sock_unix.c +++ b/src/sock_unix.c @@ -118,12 +118,12 @@ int sock_unix_addrcmp(const struct sockaddr_storage *a, const struct sockaddr_st return 0; } -/* Binds receiver , and assigns and rx-> as the callback and - * context, respectively, with as the thread mask. Returns and error code - * made of ERR_* bits on failure or ERR_NONE on success. On failure, an error - * message may be passed into . +/* Binds receiver , and assigns rx->iocb and rx->owner as the callback and + * context, respectively, with ->bind_thread as the thread mask. Returns an + * error code made of ERR_* bits on failure or ERR_NONE on success. On failure, + * an error message may be passed into . */ -int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char **errmsg) +int sock_unix_bind_receiver(struct receiver *rx, char **errmsg) { char tempname[MAXPATHLEN]; char backname[MAXPATHLEN]; @@ -285,7 +285,7 @@ int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char * rx->fd = fd; rx->flags |= RX_F_BOUND; - fd_insert(fd, rx->owner, handler, thread_mask(rx->settings->bind_thread) & all_threads_mask); + fd_insert(fd, rx->owner, rx->iocb, thread_mask(rx->settings->bind_thread) & all_threads_mask); /* for now, all regularly bound TCP listeners are exportable */ if (!(rx->flags & RX_F_INHERITED))