mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-19 06:58:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: protocol: register the receiver's I/O handler and not the protocol's

Browse Source 
Now we define a new sock_accept_iocb() for socket-based stream protocols
and use it as a wrapper for listener_accept() which now takes a listener
and not an FD anymore. This will allow the receiver's I/O cb to be
redefined during registration, and more specifically to get rid of the
hard-coded hacks in protocol_bind_all() made for syslog.

The previous ->accept() callback in the protocol was removed since it
doesn't have anything to do with accept() anymore but is more generic.
A few places where listener_accept() was compared against the FD's IO
callback for debugging purposes on the CLI were updated.
This commit is contained in:
Willy Tarreau
2020-10-15 21:29:49 +02:00
parent e140a6921f
commit a74cb38e7c
12 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cli.c
View File

@@ -53,6 +53,7 @@
#include <haproxy/sample-t.h>
#include <haproxy/server.h>
#include <haproxy/session.h>
#include <haproxy/sock.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream.h>
#include <haproxy/stream_interface.h>
@@ -1020,7 +1021,7 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
px = objt_proxy(((struct connection *)fdt.owner)->target);
is_back = conn_is_back((struct connection *)fdt.owner);
}
else if (fdt.iocb == listener_accept)
else if (fdt.iocb == sock_accept_iocb)
li = fdt.owner;
chunk_printf(&trash,
@@ -1064,7 +1065,7 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
else
chunk_appendf(&trash, " nomux");
}
else if (fdt.iocb == listener_accept) {
else if (fdt.iocb == sock_accept_iocb) {
chunk_appendf(&trash, ") l.st=%s fe=%s",
listener_state_str(li),
li->bind_conf->frontend->id);
@@ -1707,7 +1708,7 @@ static int _getsocks(char **args, char *payload, struct appctx *appctx, void *pr
/* for now we can only retrieve namespaces and interfaces from
* pure listeners.
*/
if (fdtab[cur_fd].iocb == listener_accept) {
if (fdtab[cur_fd].iocb == sock_accept_iocb) {
const struct listener *l = fdtab[cur_fd].owner;
if (l->rx.settings->interface) {