[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 02/11] sockets: factor out create_fast_reuse_socke
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 02/11] sockets: factor out create_fast_reuse_socket |
Date: |
Mon, 16 Oct 2017 21:16:41 +0100 |
From: Knut Omang <address@hidden>
Another refactoring step to prepare for fixing the problem
exposed with the test-listen test in the previous commit
Signed-off-by: Knut Omang <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
util/qemu-sockets.c | 15 ++++++++++++---
1 file 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++) {
--
2.13.5
- [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 03/11] sockets: Handle race condition between binds to the same port, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 02/11] sockets: factor out create_fast_reuse_socket,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 01/11] sockets: factor out a new try_bind() function, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 04/11] io: monitor encoutput buffer size from websocket GSource, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 06/11] io: get rid of qio_channel_websock_encode helper method, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 05/11] io: simplify websocket ping reply handling, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 09/11] io: cope with websock 'Connection' header having multiple values, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 08/11] io: get rid of bounce buffering in websock write path, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 07/11] io: pass a struct iovec into qio_channel_websock_encode, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 10/11] io: add trace points for websocket HTTP protocol headers, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 11/11] io: fix mem leak in websock error path, Daniel P. Berrange, 2017/10/16
- Re: [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16, Peter Maydell, 2017/10/17