diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-11 03:53:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:58 -0500 |
| commit | 07b0d86121cf78e0f7407364240d8eb76bde8d80 (patch) | |
| tree | 1ae46e0e2afda022e46b0432042c0438338bba6f /source4/libcli/nbt | |
| parent | 6412e8eeae6b4abfb65514b00c49419a7cb97b1a (diff) | |
| download | samba-07b0d86121cf78e0f7407364240d8eb76bde8d80.tar.gz samba-07b0d86121cf78e0f7407364240d8eb76bde8d80.tar.bz2 samba-07b0d86121cf78e0f7407364240d8eb76bde8d80.zip | |
r7483: ensure we try reading from a socket if epoll says we can, and don't
just do the write. This is needed because the write could return
-1/EAGAIN for dgram sockets, if the socket buffer is nearly full. The
epoll loop then goes on forever.
This was causing some failures in 'make test'
(This used to be commit b7fefe76a2d3c288611868f41d65af4e13ac460b)
Diffstat (limited to 'source4/libcli/nbt')
| -rw-r--r-- | source4/libcli/nbt/nbtsocket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c index f600afb79f..0401e68af8 100644 --- a/source4/libcli/nbt/nbtsocket.c +++ b/source4/libcli/nbt/nbtsocket.c @@ -292,7 +292,8 @@ static void nbt_name_socket_handler(struct event_context *ev, struct fd_event *f struct nbt_name_socket); if (flags & EVENT_FD_WRITE) { nbt_name_socket_send(nbtsock); - } else if (flags & EVENT_FD_READ) { + } + if (flags & EVENT_FD_READ) { nbt_name_socket_recv(nbtsock); } } |