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

[Qemu-devel] [PATCH] 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>
---
 slirp/socket.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/slirp/socket.c b/slirp/socket.c
index 8e8819c..23780b3 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) ||
+#ifdef _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] slirp: Port redirection option behave differently on Linux and Windows

[Stefan Weil]

Am 13.08.2013 22:00, schrieb 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>
> ---
>  slirp/socket.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/slirp/socket.c b/slirp/socket.c
> index 8e8819c..23780b3 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) ||
> +#ifdef _WIN32

Shouldn't this be replaced by #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 */

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

[Taimoor Mirza]

Thanks for reviewing the patch

On Wed, Aug 14, 2013 at 1:21 AM, Stefan Weil <sw@weilnetz.de> wrote:
> Am 13.08.2013 22:00, schrieb 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>
>> ---
>>  slirp/socket.c |    2 ++
>>  1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/slirp/socket.c b/slirp/socket.c
>> index 8e8819c..23780b3 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) ||
>> +#ifdef _WIN32
>
> Shouldn't this be replaced by #ifndef _WIN32?
Yes it should be. I am resending the patch
>
>>           (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 */
>

-Taimoor

[Qemu-devel] [PATCH] 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>
---
 slirp/socket.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/slirp/socket.c b/slirp/socket.c
index 8e8819c..23780b3 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 */
-- 
1.7.5.4

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

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 870 bytes --]

On 08/13/2013 03:05 PM, 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

When resending a patch, please use a v2 in the subject line (git
send-email --subject-prefix PATCHv2), send as a top-level thread, and
include a changelog after the --- divider that explains what changed
from v1.  See http://wiki.qemu.org/Contribute/SubmitAPatch for more hints.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

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

[Taimoor Mirza]

On Wed, Aug 14, 2013 at 2:20 AM, Eric Blake <eblake@redhat.com> wrote:
> On 08/13/2013 03:05 PM, 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
>
> When resending a patch, please use a v2 in the subject line (git
> send-email --subject-prefix PATCHv2), send as a top-level thread, and
> include a changelog after the --- divider that explains what changed
> from v1.  See http://wiki.qemu.org/Contribute/SubmitAPatch for more hints.


Thanks Eric. Should I resend with changelog of v2 and v2 in subject line?
>
> --
> Eric Blake   eblake redhat com    +1-919-301-3266
> Libvirt virtualization library http://libvirt.org
>

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

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]

On 08/14/2013 09:49 AM, Taimoor Mirza wrote:
> On Wed, Aug 14, 2013 at 2:20 AM, Eric Blake <eblake@redhat.com> wrote:
>> On 08/13/2013 03:05 PM, 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
>>
>> When resending a patch, please use a v2 in the subject line (git
>> send-email --subject-prefix PATCHv2), send as a top-level thread, and
>> include a changelog after the --- divider that explains what changed
>> from v1.  See http://wiki.qemu.org/Contribute/SubmitAPatch for more hints.
> 
> 
> Thanks Eric. Should I resend with changelog of v2 and v2 in subject line?

Yes, doing so will give it better visibility.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]