From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kuo6Z-0004TV-OL for qemu-devel@nongnu.org; Tue, 28 Oct 2008 08:55:28 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kuo6Y-0004SW-6c for qemu-devel@nongnu.org; Tue, 28 Oct 2008 08:55:26 -0400 Received: from [199.232.76.173] (port=52913 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kuo6X-0004SI-5R for qemu-devel@nongnu.org; Tue, 28 Oct 2008 08:55:25 -0400 Received: from mx1.redhat.com ([66.187.233.31]:40516) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kuo6W-0000m0-I8 for qemu-devel@nongnu.org; Tue, 28 Oct 2008 08:55:24 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m9SCtOhe019466 for ; Tue, 28 Oct 2008 08:55:24 -0400 From: Gerd Hoffmann Date: Tue, 28 Oct 2008 13:55:16 +0100 Message-Id: <1225198518-16529-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1225198518-16529-1-git-send-email-kraxel@redhat.com> References: <1225198518-16529-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] sockets: helper functions for qemu. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann This patch creates a new source and header file qemu-sockets.[ch] with a bunch of helper functions to create listening and connected sockets. New features of this code are (a) support for searching for a free port in a given range and (b) support for IPv6. The following patches put that code into use. Signed-off-by: Gerd Hoffmann --- Makefile.target | 1 + qemu-sockets.c | 391 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-sockets.h | 8 + vl.c | 13 ++ 4 files changed, 413 insertions(+), 0 deletions(-) create mode 100644 qemu-sockets.c create mode 100644 qemu-sockets.h diff --git a/Makefile.target b/Makefile.target index 547ac02..5f71972 100644 --- a/Makefile.target +++ b/Makefile.target @@ -580,6 +580,7 @@ ifndef CONFIG_USER_ONLY OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o net-checksum.o OBJS+=fw_cfg.o aio.o buffered_file.o migration.o migration-tcp.o +OBJS+=qemu-sockets.o ifdef CONFIG_WIN32 OBJS+=block-raw-win32.o else diff --git a/qemu-sockets.c b/qemu-sockets.c new file mode 100644 index 0000000..99adcd7 --- /dev/null +++ b/qemu-sockets.c @@ -0,0 +1,391 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "qemu-sockets.h" + +static int default_family = PF_UNSPEC; +static int sockets_debug = 1; + +static int inet_getport(struct addrinfo *e) +{ + struct sockaddr_in *i4; + struct sockaddr_in6 *i6; + + switch (e->ai_family) { + case PF_INET6: + i6 = (void*)e->ai_addr; + return ntohs(i6->sin6_port); + case PF_INET: + i4 = (void*)e->ai_addr; + return ntohs(i4->sin_port); + default: + return 0; + } +} + +static void inet_setport(struct addrinfo *e, int port) +{ + struct sockaddr_in *i4; + struct sockaddr_in6 *i6; + + switch (e->ai_family) { + case PF_INET6: + i6 = (void*)e->ai_addr; + i6->sin6_port = htons(port); + break; + case PF_INET: + i4 = (void*)e->ai_addr; + i4->sin_port = htons(port); + break; + } +} + +static const char *inet_strfamily(int family) +{ + switch (family) { + case PF_INET6: return "ipv6"; + case PF_INET: return "ipv4"; + case PF_UNIX: return "unix"; + } + return "????"; +} + +static void inet_print_addrinfo(const char *tag, struct addrinfo *res) +{ + struct addrinfo *e; + char uaddr[INET6_ADDRSTRLEN+1]; + char uport[33]; + + for (e = res; e != NULL; e = e->ai_next) { + getnameinfo((struct sockaddr*)e->ai_addr,e->ai_addrlen, + uaddr,INET6_ADDRSTRLEN,uport,32, + NI_NUMERICHOST | NI_NUMERICSERV); + fprintf(stderr,"%s: getaddrinfo: family %s, host %s, port %s\n", + tag, inet_strfamily(e->ai_family), uaddr, uport); + } +} + +void inet_set_ipv4(void) +{ + default_family = PF_INET; +} + +void inet_set_ipv6(void) +{ + default_family = PF_INET6; +} + +int inet_listen(const char *str, char *ostr, int olen, + int socktype, int port_offset) +{ + static const int on=1, off=0; + struct addrinfo ai,*res,*e; + char addr[64]; + char port[33]; + char uaddr[INET6_ADDRSTRLEN+1]; + char uport[33]; + const char *opts, *h; + int slisten,rc,pos,to,try_next; + + memset(&ai,0, sizeof(ai)); + ai.ai_flags = AI_PASSIVE; + ai.ai_family = default_family; + ai.ai_socktype = socktype; + + /* parse string */ + if (str[0] == ':') { + /* no host given */ + strcpy(addr,""); + if (1 != sscanf(str,":%32[^,]%n",port,&pos)) { + fprintf(stderr, "%s: portonly parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + } else if (str[0] == '[') { + /* IPv6 addr */ + if (2 != sscanf(str,"[%64[^]]]:%32[^,]%n",addr,port,&pos)) { + fprintf(stderr, "%s: ipv6 parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + ai.ai_family = PF_INET6; + } else if (isdigit(str[0])) { + /* IPv4 addr */ + if (2 != sscanf(str,"%64[0-9.]:%32[^,]%n",addr,port,&pos)) { + fprintf(stderr, "%s: ipv4 parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + ai.ai_family = PF_INET; + } else { + /* hostname */ + if (2 != sscanf(str,"%64[^:]:%32[^,]%n",addr,port,&pos)) { + fprintf(stderr, "%s: hostname parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + } + opts = str + pos; + h = strstr(opts, ",to="); + to = h ? atoi(h+4) : 0; + + /* lookup */ + if (port_offset) + snprintf(port, sizeof(port), "%d", atoi(port) + port_offset); + if (0 != (rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res))) { + fprintf(stderr,"%s: getaddrinfo(%s,%s): %s\n", __FUNCTION__, + addr, port, gai_strerror(rc)); + return -1; + } + if (sockets_debug) + inet_print_addrinfo(__FUNCTION__, res); + + /* create socket + bind */ + for (e = res; e != NULL; e = e->ai_next) { + getnameinfo((struct sockaddr*)e->ai_addr,e->ai_addrlen, + uaddr,INET6_ADDRSTRLEN,uport,32, + NI_NUMERICHOST | NI_NUMERICSERV); + if (-1 == (slisten = socket(e->ai_family, e->ai_socktype, + e->ai_protocol))) { + fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__, + inet_strfamily(e->ai_family), strerror(errno)); + continue; + } + + setsockopt(slisten,SOL_SOCKET,SO_REUSEADDR,&on,sizeof(on)); + if (e->ai_family == PF_INET6) { + if (default_family == PF_INET6) + setsockopt(slisten,IPPROTO_IPV6,IPV6_V6ONLY,&on,sizeof(on)); + else + setsockopt(slisten,IPPROTO_IPV6,IPV6_V6ONLY,&off,sizeof(off)); + } + + for (;;) { + if (0 == bind(slisten, e->ai_addr, e->ai_addrlen)) { + if (sockets_debug) + fprintf(stderr,"%s: bind(%s,%s,%d): OK\n", __FUNCTION__, + inet_strfamily(e->ai_family), uaddr, inet_getport(e)); + goto listen; + } + try_next = to && (inet_getport(e) <= to + port_offset); + if (!try_next || sockets_debug) + 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; + } + close(slisten); + } + fprintf(stderr, "%s: FAILED\n", __FUNCTION__); + return -1; + +listen: + if (0 != listen(slisten,1)) { + perror("listen"); + close(slisten); + return -1; + } + if (ostr) { + if (e->ai_family == PF_INET6) { + snprintf(ostr, olen, "[%s]:%d%s", uaddr, + inet_getport(e) - port_offset, opts); + } else { + snprintf(ostr, olen, "%s:%d%s", uaddr, + inet_getport(e) - port_offset, opts); + } + } + return slisten; +} + +int inet_connect(const char *str, int socktype) +{ + static const int on=1; + struct addrinfo ai,*res,*e; + char addr[64]; + char port[33]; + char uaddr[INET6_ADDRSTRLEN+1]; + char uport[33]; + int sock,rc; + + memset(&ai,0, sizeof(ai)); + ai.ai_flags = AI_CANONNAME; + ai.ai_family = default_family; + ai.ai_socktype = socktype; + + /* parse string */ + if (str[0] == '[') { + /* IPv6 addr */ + if (2 != sscanf(str,"[%64[^]]]:%32[^,]",addr,port)) { + fprintf(stderr, "%s: ipv6 parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + ai.ai_family = PF_INET6; + } else if (isdigit(str[0])) { + /* IPv4 addr */ + if (2 != sscanf(str,"%64[0-9.]:%32[^,]",addr,port)) { + fprintf(stderr, "%s: ipv4 parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + ai.ai_family = PF_INET; + } else { + /* hostname */ + if (2 != sscanf(str,"%64[^:]:%32[^,]",addr,port)) { + fprintf(stderr, "%s: hostname parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + } + + /* lookup */ + if (0 != (rc = getaddrinfo(addr, port, &ai, &res))) { + fprintf(stderr,"getaddrinfo(%s,%s): %s\n", gai_strerror(rc), + addr, port); + return -1; + } + if (sockets_debug) + inet_print_addrinfo(__FUNCTION__, res); + + for (e = res; e != NULL; e = e->ai_next) { + if (0 != getnameinfo((struct sockaddr*)e->ai_addr,e->ai_addrlen, + uaddr,INET6_ADDRSTRLEN,uport,32, + NI_NUMERICHOST | NI_NUMERICSERV)) { + fprintf(stderr,"%s: getnameinfo: oops\n", __FUNCTION__); + continue; + } + if (-1 == (sock = socket(e->ai_family, e->ai_socktype, + e->ai_protocol))) { + fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__, + inet_strfamily(e->ai_family), strerror(errno)); + continue; + } + setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&on,sizeof(on)); + + /* connect to peer */ + if (-1 == connect(sock,e->ai_addr,e->ai_addrlen)) { + if (sockets_debug || NULL == e->ai_next) + fprintf(stderr, "%s: connect(%s,%s,%s,%s): %s\n", __FUNCTION__, + inet_strfamily(e->ai_family), + e->ai_canonname, uaddr, uport, strerror(errno)); + close(sock); + continue; + } + if (sockets_debug) + fprintf(stderr, "%s: connect(%s,%s,%s,%s): OK\n", __FUNCTION__, + inet_strfamily(e->ai_family), + e->ai_canonname, uaddr, uport); + return sock; + } + return -1; +} + +#ifndef _WIN32 + +int unix_listen(const char *str, char *ostr, int olen) +{ + struct sockaddr_un un; + char *path, *opts; + int sock, fd, len; + + if (-1 == (sock = socket(PF_UNIX, SOCK_STREAM, 0))) { + perror("socket(unix)"); + return -1; + } + + opts = strchr(str, ','); + if (opts) { + len = opts - str; + path = malloc(len+1); + snprintf(path, len+1, "%.*s", len, str); + } else + path = strdup(str); + + un.sun_family = AF_UNIX; + if (path && strlen(path)) { + snprintf(un.sun_path, sizeof(un.sun_path), "%s", path); + } else { + char *tmpdir = getenv("TMPDIR"); + snprintf(un.sun_path, sizeof(un.sun_path), "%s/qemu-socket-XXXXXX", + tmpdir ? tmpdir : "/tmp"); + /* + * This dummy fd usage silences the mktemp() unsecure warning. + * Using mkstemp() doesn't make things more secure here + * though. bind() complains about existing files, so we have + * to unlink first and thus re-open the race window. The + * worst case possible is bind() failing, i.e. a DoS attack. + */ + fd = mkstemp(un.sun_path); close(fd); + } + snprintf(ostr, olen, "%s%s", un.sun_path, opts ? opts : ""); + + unlink(un.sun_path); + if (bind(sock, (struct sockaddr*) &un, sizeof(un)) == -1) { + fprintf(stderr, "bind(unix:%s): %s\n", un.sun_path, strerror(errno)); + goto err; + } + if (listen(sock, 1) == -1) { + fprintf(stderr, "listen(unix:%s): %s\n", un.sun_path, strerror(errno)); + goto err; + } + + if (sockets_debug) + fprintf(stderr, "bind(unix:%s): OK\n", un.sun_path); + free(path); + return sock; + +err: + free(path); + close(sock); + return -1; +} + +int unix_connect(const char *path) +{ + struct sockaddr_un un; + int sock; + + if (-1 == (sock = socket(PF_UNIX, SOCK_STREAM, 0))) { + perror("socket(unix)"); + return -1; + } + + un.sun_family = AF_UNIX; + snprintf(un.sun_path, sizeof(un.sun_path), "%s", path); + if (-1 == connect(sock, (struct sockaddr*) &un, sizeof(un))) { + fprintf(stderr, "connect(unix:%s): %s\n", path, strerror(errno)); + return -1; + } + + if (sockets_debug) + fprintf(stderr, "connect(unix:%s): OK\n", path); + return sock; +} + +#else + +int unix_listen(const char *path, char *ostr, int olen) +{ + fprintf(stderr, "unix sockets are not available on windows\n"); + return -1; +} + +int unix_connect(const char *path) +{ + fprintf(stderr, "unix sockets are not available on windows\n"); + return -1; +} + +#endif diff --git a/qemu-sockets.h b/qemu-sockets.h new file mode 100644 index 0000000..8793af3 --- /dev/null +++ b/qemu-sockets.h @@ -0,0 +1,8 @@ +int inet_listen(const char *str, char *ostr, int olen, + int socktype, int port_offset); +int inet_connect(const char *str, int socktype); +void inet_set_ipv4(void); +void inet_set_ipv6(void); + +int unix_listen(const char *path, char *ostr, int olen); +int unix_connect(const char *path); diff --git a/vl.c b/vl.c index 114f6db..2112585 100644 --- a/vl.c +++ b/vl.c @@ -37,6 +37,7 @@ #include "gdbstub.h" #include "qemu-timer.h" #include "qemu-char.h" +#include "qemu-sockets.h" #include "block.h" #include "audio/audio.h" #include "migration.h" @@ -8386,6 +8387,8 @@ enum { QEMU_OPTION_bootp, QEMU_OPTION_smb, QEMU_OPTION_redir, + QEMU_OPTION_ipv4, + QEMU_OPTION_ipv6, QEMU_OPTION_kernel, QEMU_OPTION_append, @@ -8489,6 +8492,10 @@ static const QEMUOption qemu_options[] = { #endif { "redir", HAS_ARG, QEMU_OPTION_redir }, #endif + { "4", 0, QEMU_OPTION_ipv4 }, + { "6", 0, QEMU_OPTION_ipv6 }, + { "ipv4", 0, QEMU_OPTION_ipv4 }, + { "ipv6", 0, QEMU_OPTION_ipv6 }, { "kernel", HAS_ARG, QEMU_OPTION_kernel }, { "append", HAS_ARG, QEMU_OPTION_append }, @@ -9151,6 +9158,12 @@ int main(int argc, char **argv) net_slirp_redir(optarg); break; #endif + case QEMU_OPTION_ipv4: + inet_set_ipv4(); + break; + case QEMU_OPTION_ipv6: + inet_set_ipv6(); + break; #ifdef HAS_AUDIO case QEMU_OPTION_audio_help: AUD_help (); -- 1.5.6.5