mirror of
http://git.haproxy.org/git/haproxy.git
synced 2026-02-17 18:26:53 +02:00
MINOR: protocol: register the receiver's I/O handler and not the protocol's
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:
@@ -2455,7 +2455,7 @@ void deinit(void)
|
||||
if (!fdtab || !fdtab[cur_fd].owner)
|
||||
continue;
|
||||
|
||||
if (fdtab[cur_fd].iocb == listener_accept) {
|
||||
if (fdtab[cur_fd].iocb == &sock_accept_iocb) {
|
||||
struct listener *l = fdtab[cur_fd].owner;
|
||||
|
||||
BUG_ON(l->state != LI_INIT);
|
||||
|
||||
Reference in New Issue
Block a user