mirror of
https://github.com/samba-team/samba.git
synced 2025-01-29 21:47:30 +03:00
s3: Priorize the async echo responder over the client
Without this, an active client connection can starve the echo responder. This leads to apparently "lost" SMBs. Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Thu Jul 28 18:53:38 CEST 2011 on sn-devel-104
This commit is contained in:
parent
83740555ea
commit
5812645f49
@ -2201,10 +2201,21 @@ static void smbd_server_connection_read_handler(
|
||||
if (from_client) {
|
||||
smbd_lock_socket(sconn);
|
||||
|
||||
if (lp_async_smb_echo_handler() && !fd_is_readable(fd)) {
|
||||
DEBUG(10,("the echo listener was faster\n"));
|
||||
smbd_unlock_socket(sconn);
|
||||
return;
|
||||
if (lp_async_smb_echo_handler()) {
|
||||
|
||||
if (fd_is_readable(sconn->smb1.echo_handler.trusted_fd)) {
|
||||
/*
|
||||
* This is the super-ugly hack to
|
||||
* prefer the packets forwarded by the
|
||||
* echo handler over the ones by the
|
||||
* client directly
|
||||
*/
|
||||
fd = sconn->smb1.echo_handler.trusted_fd;
|
||||
} else if (!fd_is_readable(fd)) {
|
||||
DEBUG(10,("the echo listener was faster\n"));
|
||||
smbd_unlock_socket(sconn);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/* TODO: make this completely nonblocking */
|
||||
|
Loading…
x
Reference in New Issue
Block a user