diff options
| author | Knut Omang | 2017-08-07 12:58:41 +0200 |
|---|---|---|
| committer | Daniel P. Berrange | 2017-10-16 17:55:08 +0200 |
| commit | 39f80521df1e7f1252960d1ada2bd1a41d4d2cd3 (patch) | |
| tree | db2ac41267cca7a730c499df01c4b8eac5b64e46 /util | |
| parent | sockets: factor out a new try_bind() function (diff) | |
| download | qemu-39f80521df1e7f1252960d1ada2bd1a41d4d2cd3.tar.gz qemu-39f80521df1e7f1252960d1ada2bd1a41d4d2cd3.tar.xz qemu-39f80521df1e7f1252960d1ada2bd1a41d4d2cd3.zip | |
sockets: factor out create_fast_reuse_socket
Another refactoring step to prepare for fixing the problem
exposed with the test-listen test in the previous commit
Signed-off-by: Knut Omang <knut.omang@oracle.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-sockets.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 211ebadcec..65f6dcd5ef 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -149,6 +149,16 @@ int inet_ai_family_from_address(InetSocketAddress *addr, return PF_UNSPEC; } +static int create_fast_reuse_socket(struct addrinfo *e) +{ + int slisten = qemu_socket(e->ai_family, e->ai_socktype, e->ai_protocol); + if (slisten < 0) { + return -1; + } + socket_set_fast_reuse(slisten); + return slisten; +} + static int try_bind(int socket, InetSocketAddress *saddr, struct addrinfo *e) { #ifndef IPV6_V6ONLY @@ -253,7 +263,8 @@ static int inet_listen_saddr(InetSocketAddress *saddr, getnameinfo((struct sockaddr*)e->ai_addr,e->ai_addrlen, uaddr,INET6_ADDRSTRLEN,uport,32, NI_NUMERICHOST | NI_NUMERICSERV); - slisten = qemu_socket(e->ai_family, e->ai_socktype, e->ai_protocol); + + slisten = create_fast_reuse_socket(e); if (slisten < 0) { if (!e->ai_next) { error_setg_errno(errp, errno, "Failed to create socket"); @@ -261,8 +272,6 @@ static int inet_listen_saddr(InetSocketAddress *saddr, continue; } - socket_set_fast_reuse(slisten); - port_min = inet_getport(e); port_max = saddr->has_to ? saddr->to + port_offset : port_min; for (p = port_min; p <= port_max; p++) { |