From 877691f96f4ffba2dba45ba5556eacd53b77237b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 7 Feb 2012 15:09:15 +0100 Subject: [PATCH] sockets: Clean up inet_listen_opts()'s convoluted bind() loop Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- qemu-sockets.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index e6e6c72dfd..6bcb8e3e0f 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -107,7 +107,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) char port[33]; char uaddr[INET6_ADDRSTRLEN+1]; char uport[33]; - int slisten,rc,to,try_next; + int slisten, rc, to, port_min, port_max, p; memset(&ai,0, sizeof(ai)); ai.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; @@ -159,20 +159,18 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) } #endif - for (;;) { + port_min = inet_getport(e); + port_max = to ? to + port_offset : port_min; + for (p = port_min; p <= port_max; p++) { + inet_setport(e, p); if (bind(slisten, e->ai_addr, e->ai_addrlen) == 0) { goto listen; } - try_next = to && (inet_getport(e) <= to + port_offset); - if (!try_next) + if (p == port_max) { fprintf(stderr,"%s: bind(%s,%s,%d): %s\n", __FUNCTION__, inet_strfamily(e->ai_family), uaddr, inet_getport(e), strerror(errno)); - if (try_next) { - inet_setport(e, inet_getport(e) + 1); - continue; } - break; } closesocket(slisten); }