[Qemu-devel] [PATCH v2] slirp: Port redirection option behave differently on Linux and Windows

[Qemu-devel] [PATCH v2] slirp: Port redirection option behave differently on Linux and Windows

[Taimoor]

From: Taimoor Mirza <tmirza@codesourcery.com>

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>
---
Changed #ifdef to #ifndef as SO_REUSEADDR should not be set in case of Windows.

 slirp/socket.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/slirp/socket.c b/slirp/socket.c
index 8e8819c..e4685bb 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -1,4 +1,4 @@
-/*
+x/*
  * Copyright (c) 1995 Danny Gasparovski.
  *
  * Please read the file COPYRIGHT for the
@@ -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 */
-- 
1.7.5.4

Re: [Qemu-devel] [PATCH v2] slirp: Port redirection option behave differently on Linux and Windows

[Alex Bligh]

--On 15 August 2013 23:13:28 +0500 Taimoor <taimoor.mrza@gmail.com> wrote:

> diff --git a/slirp/socket.c b/slirp/socket.c
> index 8e8819c..e4685bb 100644
> --- a/slirp/socket.c
> +++ b/slirp/socket.c
> @@ -1,4 +1,4 @@
> -/*
> +x/*
>   * Copyright (c) 1995 Danny Gasparovski.
>   *
>   * Please read the file COPYRIGHT for the
> @@ -627,7 +627,9 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport,

You appear to have introduced an additional character at the top of
the file.

-- 
Alex Bligh

Re: [Qemu-devel] [Qemu-trivial] [PATCH v2] slirp: Port redirection option behave differently on Linux and Windows

[Michael Tokarev]

15.08.2013 22:13, Taimoor wrote:
> From: Taimoor Mirza <tmirza@codesourcery.com>
>
> 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

Thanks, applied to the trivial-patches queue (after fixing the diff as mentioned
by Alex Bligh).

/mjt