Re: [Qemu-devel] [PATCH 1/5] slirp: closesocket must be called to close sockets on windows

[Thomas Huth <thuth@redhat.com>]

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