Commit 9e8f8b1c authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'sweil/mingw' into staging 



# By Sebastian Ottlik
# Via Stefan Weil
* sweil/mingw:
  util: call socket_set_fast_reuse instead of setting SO_REUSEADDR
  slirp: call socket_set_fast_reuse instead of setting SO_REUSEADDR
  net: call socket_set_fast_reuse instead of setting SO_REUSEADDR
  gdbstub: call socket_set_fast_reuse instead of setting SO_REUSEADDR
  util: add socket_set_fast_reuse function which will replace setting SO_REUSEADDR

Message-id: 1380735690-24009-1-git-send-email-sw@weilnetz.de
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents dfe22799 04fd1c78

gdbstub.c

+2 −4
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ static void gdb_accept(void) 
static int gdbserver_open(int port)

{

    struct sockaddr_in sockaddr;

    int fd, val, ret;

    int fd, ret;



    fd = socket(PF_INET, SOCK_STREAM, 0);

    if (fd < 0) {
@@ -1564,9 +1564,7 @@ static int gdbserver_open(int port) 
    fcntl(fd, F_SETFD, FD_CLOEXEC);

#endif



    /* allow fast reuse */

    val = 1;

    qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));

    socket_set_fast_reuse(fd);



    sockaddr.sin_family = AF_INET;

    sockaddr.sin_port = htons(port);

include/qemu/sockets.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ int socket_set_cork(int fd, int v); 
int socket_set_nodelay(int fd);

void qemu_set_block(int fd);

void qemu_set_nonblock(int fd);

int socket_set_fast_reuse(int fd);

int send_all(int fd, const void *buf, int len1);

int recv_all(int fd, void *buf, int len1, bool single_read);

net/socket.c

+10 −9
Original line number Diff line number Diff line
@@ -262,6 +262,11 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr 
        return -1;

    }



    /* Allow multiple sockets to bind the same multicast ip and port by setting

     * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set

     * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR

     * only on posix systems.

     */

    val = 1;

    ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));

    if (ret < 0) {
@@ -510,7 +515,7 @@ static int net_socket_listen_init(NetClientState *peer, 
    NetClientState *nc;

    NetSocketState *s;

    struct sockaddr_in saddr;

    int fd, val, ret;

    int fd, ret;



    if (parse_host_port(&saddr, host_str) < 0)

        return -1;
@@ -522,9 +527,7 @@ static int net_socket_listen_init(NetClientState *peer, 
    }

    qemu_set_nonblock(fd);



    /* allow fast reuse */

    val = 1;

    qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));

    socket_set_fast_reuse(fd);



    ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));

    if (ret < 0) {
@@ -645,7 +648,7 @@ static int net_socket_udp_init(NetClientState *peer, 
                                 const char *lhost)

{

    NetSocketState *s;

    int fd, val, ret;

    int fd, ret;

    struct sockaddr_in laddr, raddr;



    if (parse_host_port(&laddr, lhost) < 0) {
@@ -661,11 +664,9 @@ static int net_socket_udp_init(NetClientState *peer, 
        perror("socket(PF_INET, SOCK_DGRAM)");

        return -1;

    }

    val = 1;

    ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,

                          &val, sizeof(val));



    ret = socket_set_fast_reuse(fd);

    if (ret < 0) {

        perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");

        closesocket(fd);

        return -1;

    }

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 */