mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32 socket fixes

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1876 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-04-30 22:53:25 +00:00
parent f354832878
commit 6ca957f08f
3 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qemu_socket.h Normal file
View File

@ -0,0 +1,30 @@
/* headers to use the BSD sockets */
#ifndef QEMU_SOCKET_H
#define QEMU_SOCKET_H
#ifdef _WIN32
#include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#define socket_error() WSAGetLastError()
#undef EINTR
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EINTR WSAEINTR
#define EINPROGRESS WSAEINPROGRESS
#else
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#define socket_error() errno
#define closesocket(s) close(s)
#endif /* !_WIN32 */
void socket_set_nonblock(int fd);
#endif /* QEMU_SOCKET_H */

13
vl.c
View File

@ -66,12 +66,12 @@
#include <malloc.h> #include <malloc.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#include <windows.h> #include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#define getopt_long_only getopt_long #define getopt_long_only getopt_long
#define memalign(align, size) malloc(size) #define memalign(align, size) malloc(size)
#endif #endif
#include "qemu_socket.h"
#ifdef CONFIG_SDL #ifdef CONFIG_SDL
#ifdef __APPLE__ #ifdef __APPLE__
#include <SDL/SDL.h> #include <SDL/SDL.h>
@ -1085,12 +1085,6 @@ CharDriverState *qemu_chr_open_null(void)
#ifdef _WIN32 #ifdef _WIN32
#define socket_error() WSAGetLastError()
#undef EINTR
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EINTR WSAEINTR
#define EINPROGRESS WSAEINPROGRESS
static void socket_cleanup(void) static void socket_cleanup(void)
{ {
WSACleanup(); WSACleanup();
@ -1142,9 +1136,6 @@ void socket_set_nonblock(int fd)
#else #else
#define socket_error() errno
#define closesocket(s) close(s)
static int unix_write(int fd, const uint8_t *buf, int len1) static int unix_write(int fd, const uint8_t *buf, int len1)
{ {
int ret, len; int ret, len;

27
vnc.c
View File

@ -1,9 +1,5 @@
#include "vl.h" #include "vl.h"
#include "qemu_socket.h"
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <fcntl.h>
#define VNC_REFRESH_INTERVAL (1000 / 30) #define VNC_REFRESH_INTERVAL (1000 / 30)
@ -386,14 +382,14 @@ static void buffer_append(Buffer *buffer, const void *data, size_t len)
buffer->offset += len; buffer->offset += len;
} }
static int vnc_client_io_error(VncState *vs, int ret) static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
{ {
if (ret == 0 || ret == -1) { if (ret == 0 || ret == -1) {
if (ret == -1 && (errno == EINTR || errno == EAGAIN)) if (ret == -1 && (last_errno == EINTR || last_errno == EAGAIN))
return 0; return 0;
qemu_set_fd_handler2(vs->csock, NULL, NULL, NULL, NULL); qemu_set_fd_handler2(vs->csock, NULL, NULL, NULL, NULL);
close(vs->csock); closesocket(vs->csock);
vs->csock = -1; vs->csock = -1;
buffer_reset(&vs->input); buffer_reset(&vs->input);
buffer_reset(&vs->output); buffer_reset(&vs->output);
@ -405,8 +401,7 @@ static int vnc_client_io_error(VncState *vs, int ret)
static void vnc_client_error(VncState *vs) static void vnc_client_error(VncState *vs)
{ {
errno = EINVAL; vnc_client_io_error(vs, -1, EINVAL);
vnc_client_io_error(vs, -1);
} }
static void vnc_client_write(void *opaque) static void vnc_client_write(void *opaque)
@ -414,8 +409,8 @@ static void vnc_client_write(void *opaque)
ssize_t ret; ssize_t ret;
VncState *vs = opaque; VncState *vs = opaque;
ret = write(vs->csock, vs->output.buffer, vs->output.offset); ret = send(vs->csock, vs->output.buffer, vs->output.offset, 0);
ret = vnc_client_io_error(vs, ret); ret = vnc_client_io_error(vs, ret, socket_error());
if (!ret) if (!ret)
return; return;
@ -440,8 +435,8 @@ static void vnc_client_read(void *opaque)
buffer_reserve(&vs->input, 4096); buffer_reserve(&vs->input, 4096);
ret = read(vs->csock, buffer_end(&vs->input), 4096); ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0);
ret = vnc_client_io_error(vs, ret); ret = vnc_client_io_error(vs, ret, socket_error());
if (!ret) if (!ret)
return; return;
@ -812,7 +807,7 @@ static void vnc_listen_read(void *opaque)
vs->csock = accept(vs->lsock, (struct sockaddr *)&addr, &addrlen); vs->csock = accept(vs->lsock, (struct sockaddr *)&addr, &addrlen);
if (vs->csock != -1) { if (vs->csock != -1) {
fcntl(vs->csock, F_SETFL, O_NONBLOCK); socket_set_nonblock(vs->csock);
qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, opaque); qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, opaque);
vnc_write(vs, "RFB 003.003\n", 12); vnc_write(vs, "RFB 003.003\n", 12);
vnc_flush(vs); vnc_flush(vs);
@ -862,7 +857,7 @@ void vnc_display_init(DisplayState *ds, int display)
reuse_addr = 1; reuse_addr = 1;
ret = setsockopt(vs->lsock, SOL_SOCKET, SO_REUSEADDR, ret = setsockopt(vs->lsock, SOL_SOCKET, SO_REUSEADDR,
&reuse_addr, sizeof(reuse_addr)); (const char *)&reuse_addr, sizeof(reuse_addr));
if (ret == -1) { if (ret == -1) {
fprintf(stderr, "setsockopt() failed\n"); fprintf(stderr, "setsockopt() failed\n");
exit(1); exit(1);