diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-09 07:52:21 -0700 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-09 07:52:21 -0700 |
| commit | 9e8f8b1cd8e1b85dc93c367c4745f9944079a37b (patch) | |
| tree | a4368aa23843f61829c01eb25a0deebee2262642 /slirp/socket.c | |
| parent | dfe22799751818115ed6d36bedc8a55b2026de3a (diff) | |
| parent | 04fd1c789677fe121cb9546c652d088c994477fb (diff) | |
| download | hqemu-9e8f8b1cd8e1b85dc93c367c4745f9944079a37b.zip hqemu-9e8f8b1cd8e1b85dc93c367c4745f9944079a37b.tar.gz | |
Merge remote-tracking branch 'sweil/mingw' into staging
# By Sebastian Ottlik
# Via Stefan Weil
* sweil/mingw:
util: call socket_set_fast_reuse instead of setting SO_REUSEADDR
slirp: call socket_set_fast_reuse instead of setting SO_REUSEADDR
net: call socket_set_fast_reuse instead of setting SO_REUSEADDR
gdbstub: call socket_set_fast_reuse instead of setting SO_REUSEADDR
util: add socket_set_fast_reuse function which will replace setting SO_REUSEADDR
Message-id: 1380735690-24009-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'slirp/socket.c')
| -rw-r--r-- | slirp/socket.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/slirp/socket.c b/slirp/socket.c index 25d60e7..37ac5cf 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -627,9 +627,7 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, addr.sin_port = hport; if (((s = qemu_socket(AF_INET,SOCK_STREAM,0)) < 0) || -#ifndef _WIN32 - (qemu_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int)) < 0) || -#endif + (socket_set_fast_reuse(s) < 0) || (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) || (listen(s,1) < 0)) { int tmperrno = errno; /* Don't clobber the real reason we failed */ |
