Commit aad1239a authored by Sebastian Ottlik's avatar Sebastian Ottlik Committed by Stefan Weil
Browse files

slirp: call socket_set_fast_reuse instead of setting SO_REUSEADDR 



SO_REUSEADDR should be avoided on Windows but is desired on other operating
systems. So instead of setting it we call socket_set_fast_reuse that will result
in the appropriate behaviour on all operating systems.

Signed-off-by: default avatarSebastian Ottlik <ottlik@fzi.de>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Weil <sw@weilnetz.de>
parent bcbe92fb

slirp/misc.c

+1 −2
Original line number Diff line number Diff line
@@ -212,8 +212,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty) 
                    so->s = accept(s, (struct sockaddr *)&addr, &addrlen);

                } while (so->s < 0 && errno == EINTR);

                closesocket(s);

                opt = 1;

                qemu_setsockopt(so->s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));

                socket_set_fast_reuse(so->s);

                opt = 1;

                qemu_setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));

		qemu_set_nonblock(so->s);

slirp/socket.c

+1 −3
Original line number Diff line number Diff line
@@ -627,9 +627,7 @@ 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

	    (socket_set_fast_reuse(s) < 0) ||

	    (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) ||

	    (listen(s,1) < 0)) {

		int tmperrno = errno; /* Don't clobber the real reason we failed */

slirp/tcp_subr.c

+2 −4
Original line number Diff line number Diff line
@@ -337,8 +337,7 @@ int tcp_fconnect(struct socket *so) 
    struct sockaddr_in addr;



    qemu_set_nonblock(s);

    opt = 1;

    qemu_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));

    socket_set_fast_reuse(s);

    opt = 1;

    qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
@@ -426,8 +425,7 @@ void tcp_connect(struct socket *inso) 
        return;

    }

    qemu_set_nonblock(s);

    opt = 1;

    qemu_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));

    socket_set_fast_reuse(s);

    opt = 1;

    qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));

    socket_set_nodelay(s);

slirp/udp.c

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ udp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, 
{

	struct sockaddr_in addr;

	struct socket *so;

	socklen_t addrlen = sizeof(struct sockaddr_in), opt = 1;

	socklen_t addrlen = sizeof(struct sockaddr_in);



	so = socreate(slirp);

	if (!so) {
@@ -372,7 +372,7 @@ udp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, 
		udp_detach(so);

		return NULL;

	}

	qemu_setsockopt(so->s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));

	socket_set_fast_reuse(so->s);



	getsockname(so->s,(struct sockaddr *)&addr,&addrlen);

	so->so_fport = addr.sin_port;