From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54499)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1Zr5Ep-0005Ck-7V
	for qemu-devel@nongnu.org; Tue, 27 Oct 2015 10:28:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1Zr5El-0005v4-UE
	for qemu-devel@nongnu.org; Tue, 27 Oct 2015 10:28:35 -0400
Received: from mx1.redhat.com ([209.132.183.28]:51889)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1Zr5El-0005uf-P1
	for qemu-devel@nongnu.org; Tue, 27 Oct 2015 10:28:31 -0400
References: <03006E3FC39B5A48AB9DBCCC101090A823806F4083@REDROOF2.alohasunset.com>
From: Thomas Huth <thuth@redhat.com>
Message-ID: <562F8A0C.8070607@redhat.com>
Date: Tue, 27 Oct 2015 15:28:28 +0100
MIME-Version: 1.0
In-Reply-To: <03006E3FC39B5A48AB9DBCCC101090A823806F4083@REDROOF2.alohasunset.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/5] slirp: closesocket must be called to
 close sockets on windows
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Mark Pizzolato <Mark@infocomm.com>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: "jan.kiszka@siemens.com" <jan.kiszka@siemens.com>, "sw@weilnetz.de" <sw@weilnetz.de>

On 22/10/15 01:15, Mark Pizzolato wrote:
> Signed-off-by: Mark Pizzolato <mark@infocomm.com>
> ---
>  slirp/slirp.c  | 2 +-
>  slirp/socket.c | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/slirp/slirp.c b/slirp/slirp.c
> index 35f819a..d18faa8 100644
> --- a/slirp/slirp.c
> +++ b/slirp/slirp.c
> @@ -846,7 +846,7 @@ int slirp_remove_hostfwd(Slirp *slirp, int is_udp, struct in_addr host_addr,
>              getsockname(so->s, (struct sockaddr *)&addr, &addr_len) == 0 &&
>              addr.sin_addr.s_addr == host_addr.s_addr &&
>              addr.sin_port == port) {
> -            close(so->s);
> +            closesocket(so->s);
>              sofree(so);
>              return 0;
>          }
> diff --git a/slirp/socket.c b/slirp/socket.c
> index 37ac5cf..4a20e08 100644
> --- a/slirp/socket.c
> +++ b/slirp/socket.c
> @@ -632,8 +632,9 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
>  	    (listen(s,1) < 0)) {
>  		int tmperrno = errno; /* Don't clobber the real reason we failed */
>  
> -		close(s);
> +		closesocket(s);
>  		sofree(so);
> +		fprintf (stderr, "Socket Error %d", tmperrno);

Looks like you've left some debugging code in here? I think that should
be removed.

 Thomas