diff options
author | Taimoor Mirza <tmirza@codesourcery.com> | 2013-08-15 23:13:28 +0500 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2013-09-01 18:52:30 +0400 |
commit | efcb7e45290ecc8633f7c5bdf02ac86f6289fa7d (patch) | |
tree | adca823dd54dccd7edc8a8b5d3c209c9d4091a57 | |
parent | 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07 (diff) |
slirp: Port redirection option behave differently on Linux and Windows
port redirection code uses SO_REUSEADDR socket option before binding to
host port. Behavior of SO_REUSEADDR is different on Windows and Linux.
Relaunching QEMU with same host and guest port redirection values on Linux
throws error but on Windows it does not throw any error.
Problem is discussed in http://lists.gnu.org/archive/html/qemu-devel/2013-04/msg03089.html
Signed-off-by: Taimoor Mirza <tmirza@codesourcery.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r-- | slirp/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/slirp/socket.c b/slirp/socket.c index 8e8819cf30..25d60e7a89 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -627,7 +627,9 @@ 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 (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) || (listen(s,1) < 0)) { int tmperrno = errno; /* Don't clobber the real reason we failed */ |