From patchwork Fri Oct 22 18:43:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 68915 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 ADCBAB70CD for ; Sat, 23 Oct 2010 05:58:52 +1100 (EST) Received: from localhost ([127.0.0.1]:36465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9Moq-0008UG-Im for incoming@patchwork.ozlabs.org; Fri, 22 Oct 2010 14:58:24 -0400 Received: from [140.186.70.92] (port=58343 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9Mb6-00070t-1s for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:44:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9Mb2-0001p6-Vb for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:44:11 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:53232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9Mb2-0001ow-TA for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:44:08 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o9MINKdf021382 for ; Fri, 22 Oct 2010 14:23:20 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9MIi7nx2318470 for ; Fri, 22 Oct 2010 14:44:07 -0400 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 o9MIi6uJ015360 for ; Fri, 22 Oct 2010 14:44:07 -0400 Received: from localhost.localdomain (sig-9-76-202-211.mts.ibm.com [9.76.202.211]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9MIhci1013644; Fri, 22 Oct 2010 14:44:05 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 22 Oct 2010 13:43:28 -0500 Message-Id: <1287773011-24726-13-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1287773011-24726-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1287773011-24726-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: aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH 12/15] 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 5ec4e77..86a8e5b 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -658,3 +658,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 39d5d40..d2522b3 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -34,5 +34,7 @@ int vp_set_fd_handler(int fd, /* virtproxy interface */ VPDriver *vp_new(int fd, bool listen); 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 */