From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60757 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIAAZ-0006id-6W for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:17:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIAAV-0006yf-98 for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:17:11 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:40399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIAAV-0006yS-3m for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:17:07 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e4.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAG10Rka007807 for ; Mon, 15 Nov 2010 20:00:27 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAG1H6TU290018 for ; Mon, 15 Nov 2010 20:17:06 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oAG1H5qr028564 for ; Mon, 15 Nov 2010 20:17:06 -0500 From: Michael Roth Date: Mon, 15 Nov 2010 19:16:10 -0600 Message-Id: <1289870175-14880-17-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1289870175-14880-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1289870175-14880-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC][PATCH v3 16/21] virtproxy: add option parser helper vp_parse() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agl@linux.vnet.ibm.com, abeekhof@redhat.com, mdroth@linux.vnet.ibm.com, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, amit.shah@redhat.com This routine will parse iforward/oforward options for both qemu-vp and the virtproxy chardev Signed-off-by: Michael Roth --- virtproxy.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtproxy.h | 1 + 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/virtproxy.c b/virtproxy.c index f1f6859..78cda04 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -895,3 +895,80 @@ int vp_set_iforward(VPDriver *drv, const char *service_id, const char *addr, return 0; } + +/* utility function to parse iforward/oforward options for qemu-vp + * or virtproxy chardev and put them into QemuOpts + */ +int vp_parse(QemuOpts *opts, const char *str, bool is_channel) +{ + /* TODO: use VP_SERVICE_ID_LEN, bring it into virtproxy.h */ + char service_id[32]; + char channel_method[32]; + char index[10]; + char *addr; + char port[33]; + int pos, ret; + + if (is_channel == false) { + /* parse service id */ + ret = sscanf(str,"%32[^:]:%n",service_id,&pos); + if (ret != 1) { + LOG("error parsing service id"); + return -1; + } + qemu_opt_set(opts, "service_id", service_id); + } else { + /* parse connection type */ + ret = sscanf(str,"%32[^:]:%n",channel_method,&pos); + if (ret != 1) { + LOG("error parsing channel method"); + return -1; + } + qemu_opt_set(opts, "channel_method", channel_method); + } + str += pos; + pos = 0; + + /* parse path/addr and port */ + if (str[0] == '[') { + /* ipv6 formatted */ + ret = sscanf(str,"[%a[^]:]]:%32[^:]%n",&addr,port,&pos); + qemu_opt_set(opts, "ipv6", "on"); + } else { + ret = sscanf(str,"%a[^:]:%32[^:]%n",&addr,port,&pos); + qemu_opt_set(opts, "ipv4", "on"); + } + + if (ret != 2) { + LOG("error parsing path/addr/port"); + return -1; + } else if (port[0] == '-') { + /* no port given, assume unix path */ + qemu_opt_set(opts, "path", addr); + } else { + qemu_opt_set(opts, "host", addr); + qemu_opt_set(opts, "port", port); + qemu_free(addr); + } + str += pos; + pos = 0; + + if (str[0] == ':') { + /* parse optional index parameter */ + ret = sscanf(str,":%10[^:]%n",index,&pos); + } else { + qemu_opt_set(opts, "index", "0"); + return 0; + } + + if (ret != 1) { + LOG("error parsing index"); + return -1; + } else { + qemu_opt_set(opts, "index", index); + } + str += pos; + pos = 0; + + return 0; +} diff --git a/virtproxy.h b/virtproxy.h index ef168b0..6a53487 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -44,5 +44,6 @@ int vp_handle_packet_buf(VPDriver *drv, const void *buf, int count); int vp_set_oforward(VPDriver *drv, int fd, const char *service_id); int vp_set_iforward(VPDriver *drv, const char *service_id, const char *addr, const char *port, bool ipv6); +int vp_parse(QemuOpts *opts, const char *str, bool is_channel); #endif /* VIRTPROXY_H */ -- 1.7.0.4