From patchwork Wed Nov 10 22:28:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 70715 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 ozlabs.org (Postfix) with ESMTPS id B826FB7117 for ; Thu, 11 Nov 2010 09:58:35 +1100 (EST) Received: from localhost ([127.0.0.1]:59919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGJYC-0000qY-Ls for incoming@patchwork.ozlabs.org; Wed, 10 Nov 2010 17:53:56 -0500 Received: from [140.186.70.92] (port=41344 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGJDL-0000nK-BK for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:32:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGJ9q-0007rg-En for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:28:47 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:50325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGJ9q-0007rY-A9 for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:28:46 -0500 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAAM7M0f011148 for ; Wed, 10 Nov 2010 17:07:22 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAAMSjB9147792 for ; Wed, 10 Nov 2010 17:28:45 -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 oAAMSjW1003071 for ; Wed, 10 Nov 2010 17:28:45 -0500 Received: from localhost.localdomain (sig-9-65-242-217.mts.ibm.com [9.65.242.217]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAAMSI5Y001385; Wed, 10 Nov 2010 17:28:44 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 10 Nov 2010 16:28:09 -0600 Message-Id: <1289428095-5059-14-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289428095-5059-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1289428095-5059-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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 Subject: [Qemu-devel] [RFC][PATCH v2 13/19] virtproxy: interfaces to set/remove VPIForwards 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 Signed-off-by: Michael Roth --- virtproxy.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtproxy.h | 2 ++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/virtproxy.c b/virtproxy.c index 01a36c2..b683ee6 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -722,3 +722,62 @@ int vp_set_oforward(VPDriver *drv, int fd, const char *service_id) return 0; } + +/* add/modify a service_id -> net/unix socket mapping + * + * "service_id" is a user-defined id for the service. this is what the + * remote end will use to proxy connections to a specific service on + * our end. + * + * if "port" is NULL, "addr" is the address of the net socket the + * service is running on. otherwise, addr is the path to the unix socket + * the service is running on. + * + * if "port" AND "addr" are NULL, find and remove the current iforward + * for this "service_id" if it exists. + * + * "ipv6" is a bool denoting whether or not to use ipv6 + */ +int vp_set_iforward(VPDriver *drv, const char *service_id, const char *addr, + const char *port, bool ipv6) +{ + VPIForward *f = get_iforward(drv, service_id); + + if (addr == NULL && port == NULL) { + if (f != NULL) { + qemu_opts_del(f->socket_opts); + QLIST_REMOVE(f, next); + qemu_free(f); + } + return 0; + } + + if (f == NULL) { + f = qemu_mallocz(sizeof(VPIForward)); + f->drv = drv; + strncpy(f->service_id, service_id, VP_SERVICE_ID_LEN); + QLIST_INSERT_HEAD(&drv->iforwards, f, next); + } else { + qemu_opts_del(f->socket_opts); + } + + /* stick socket-related options in a QemuOpts so we can + * utilize qemu socket utility functions directly + */ + f->socket_opts = qemu_opts_create(&vp_socket_opts, NULL, 0); + if (port == NULL) { + /* no port given, assume unix path */ + qemu_opt_set(f->socket_opts, "path", addr); + } else { + qemu_opt_set(f->socket_opts, "host", addr); + qemu_opt_set(f->socket_opts, "port", port); + } + + if (ipv6) { + qemu_opt_set(f->socket_opts, "ipv6", "on"); + } else { + qemu_opt_set(f->socket_opts, "ipv4", "on"); + } + + return 0; +} diff --git a/virtproxy.h b/virtproxy.h index e901600..83cc905 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -41,5 +41,7 @@ void vp_chr_read(CharDriverState *s, uint8_t *buf, int len); VPDriver *vp_new(enum vp_context ctx, CharDriverState *s, int fd, bool listen); 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); #endif /* VIRTPROXY_H */