From patchwork Thu Sep 10 08:58:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33280 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 745BAB7099 for ; Thu, 10 Sep 2009 19:18:38 +1000 (EST) Received: from localhost ([127.0.0.1]:55759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlfnW-00079e-BO for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 05:18:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlfUr-0005TZ-Hl for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlfUm-0005RN-Vx for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:16 -0400 Received: from [199.232.76.173] (port=49323 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlfUm-0005Qp-1d for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2971) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlfUi-0007WK-5S for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:10 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A8x605012260 for ; Thu, 10 Sep 2009 04:59:06 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-74.ams2.redhat.com [10.36.9.74]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8A8x2D4020720; Thu, 10 Sep 2009 04:59:04 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 82994700E0; Thu, 10 Sep 2009 10:58:56 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 10:58:40 +0200 Message-Id: <1252573135-27688-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1252573135-27688-1-git-send-email-kraxel@redhat.com> References: <1252573135-27688-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 08/23] sockets: add inet_connect_opts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add inet_connect_opts(). Does the same as inet_connect(), but uses QemuOpts. inet_connect() is a compatibility wrapper for inet_connect_opts() now and should go away some day. Signed-off-by: Gerd Hoffmann --- qemu-sockets.c | 129 +++++++++++++++++++++++++++++++++++++++++-------------- qemu_socket.h | 1 + 2 files changed, 97 insertions(+), 33 deletions(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index 0d0ce44..65db94e 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -37,6 +37,21 @@ QemuOptsList dummy_opts = { { .name = "path", .type = QEMU_OPT_STRING, + },{ + .name = "host", + .type = QEMU_OPT_STRING, + },{ + .name = "port", + .type = QEMU_OPT_STRING, + },{ + .name = "to", + .type = QEMU_OPT_NUMBER, + },{ + .name = "ipv4", + .type = QEMU_OPT_BOOL, + },{ + .name = "ipv6", + .type = QEMU_OPT_BOOL, }, { /* end if list */ } }, @@ -237,11 +252,11 @@ listen: return slisten; } -int inet_connect(const char *str, int socktype) +int inet_connect_opts(QemuOpts *opts) { struct addrinfo ai,*res,*e; - char addr[64]; - char port[33]; + const char *addr; + const char *port; char uaddr[INET6_ADDRSTRLEN+1]; char uport[33]; int sock,rc; @@ -249,44 +264,24 @@ int inet_connect(const char *str, int socktype) memset(&ai,0, sizeof(ai)); ai.ai_flags = AI_CANONNAME | AI_ADDRCONFIG; ai.ai_family = PF_UNSPEC; - ai.ai_socktype = socktype; + ai.ai_socktype = SOCK_STREAM; - /* parse address */ - 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 (qemu_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; - } + addr = qemu_opt_get(opts, "host"); + port = qemu_opt_get(opts, "port"); + if (addr == NULL || port == NULL) { + fprintf(stderr, "inet_connect: host and/or port not specified\n"); + return -1; } - /* parse options */ - if (strstr(str, ",ipv4")) + if (qemu_opt_get_bool(opts, "ipv4", 0)) ai.ai_family = PF_INET; - if (strstr(str, ",ipv6")) + if (qemu_opt_get_bool(opts, "ipv6", 0)) ai.ai_family = PF_INET6; /* lookup */ if (0 != (rc = getaddrinfo(addr, port, &ai, &res))) { - fprintf(stderr,"getaddrinfo(%s,%s): %s\n", gai_strerror(rc), - addr, port); + fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, + gai_strerror(rc)); return -1; } if (sockets_debug) @@ -327,6 +322,74 @@ int inet_connect(const char *str, int socktype) return -1; } +/* compatibility wrapper */ +static int inet_parse(QemuOpts *opts, const char *str) +{ + const char *optstr, *h; + char addr[64]; + char port[33]; + int pos; + + /* parse address */ + if (str[0] == ':') { + /* no host given */ + addr[0] = '\0'; + 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; + } + qemu_opt_set(opts, "ipv6", "yes"); + } else if (qemu_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; + } + qemu_opt_set(opts, "ipv4", "yes"); + } else { + /* hostname */ + if (2 != sscanf(str,"%64[^:]:%32[^,]%n",addr,port,&pos)) { + fprintf(stderr, "%s: hostname parse error (%s)\n", + __FUNCTION__, str); + return -1; + } + } + qemu_opt_set(opts, "host", addr); + qemu_opt_set(opts, "port", port); + + /* parse options */ + optstr = str + pos; + h = strstr(optstr, ",to="); + if (h) + qemu_opt_set(opts, "to", h+4); + if (strstr(optstr, ",ipv4")) + qemu_opt_set(opts, "ipv4", "yes"); + if (strstr(optstr, ",ipv6")) + qemu_opt_set(opts, "ipv6", "yes"); + return 0; +} + +int inet_connect(const char *str, int socktype) +{ + QemuOpts *opts; + int sock = -1; + + opts = qemu_opts_create(&dummy_opts, NULL, 0); + if (inet_parse(opts, str) == 0) + sock = inet_connect_opts(opts); + qemu_opts_del(opts); + return sock; +} + #ifndef _WIN32 int unix_listen_opts(QemuOpts *opts) diff --git a/qemu_socket.h b/qemu_socket.h index 354c114..662f427 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -38,6 +38,7 @@ int send_all(int fd, const void *buf, int len1); /* New, ipv6-ready socket helper functions, see qemu-sockets.c */ int inet_listen(const char *str, char *ostr, int olen, int socktype, int port_offset); +int inet_connect_opts(QemuOpts *opts); int inet_connect(const char *str, int socktype); int unix_listen_opts(QemuOpts *opts);