diff options
| -rw-r--r-- | vnc.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/vnc.c b/vnc.c index 2179d38d08..842124b056 100644 --- a/vnc.c +++ b/vnc.c @@ -633,8 +633,18 @@ static void buffer_append(Buffer *buffer, const void *data, size_t len) static int vnc_client_io_error(VncState *vs, int ret, int last_errno) { if (ret == 0 || ret == -1) { - if (ret == -1 && (last_errno == EINTR || last_errno == EAGAIN)) - return 0; + if (ret == -1) { + switch (last_errno) { + case EINTR: + case EAGAIN: +#ifdef _WIN32 + case WSAEWOULDBLOCK: +#endif + return 0; + default: + break; + } + } VNC_DEBUG("Closing down client sock %d %d\n", ret, ret < 0 ? last_errno : 0); qemu_set_fd_handler2(vs->csock, NULL, NULL, NULL, NULL); @@ -2086,10 +2096,10 @@ int vnc_display_open(DisplayState *ds, const char *display) struct sockaddr_in iaddr; #ifndef _WIN32 struct sockaddr_un uaddr; + const char *p; #endif int reuse_addr, ret; socklen_t addrlen; - const char *p; VncState *vs = ds ? (VncState *)ds->opaque : vnc_state; const char *options; int password = 0; |