aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaimoor Mirza <tmirza@codesourcery.com>2013-08-15 23:13:28 +0500
committerMichael Tokarev <mjt@tls.msk.ru>2013-09-01 18:52:30 +0400
commit9baa914c3ddf6f9ad2098f889bd0ac0fb71896be (patch)
tree18b5ec3f04f1a83ee3915db6c6c527abe2be80c8
parent2d419d6587c516adc7e9de3e562a79ba51742661 (diff)
downloadslirp-9baa914c3ddf6f9ad2098f889bd0ac0fb71896be.zip
slirp-9baa914c3ddf6f9ad2098f889bd0ac0fb71896be.tar.gz
slirp-9baa914c3ddf6f9ad2098f889bd0ac0fb71896be.tar.bz2
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--socket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/socket.c b/socket.c
index b7e9e49..c2386bb 100644
--- a/socket.c
+++ b/socket.c
@@ -633,7 +633,9 @@ struct socket *tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport,
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 */