From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52981 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDoiT-0002CQ-5Y for qemu-devel@nongnu.org; Wed, 03 Nov 2010 21:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDoNd-0007f2-HO for qemu-devel@nongnu.org; Wed, 03 Nov 2010 21:12:42 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:41774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDoNd-0007em-9v for qemu-devel@nongnu.org; Wed, 03 Nov 2010 21:12:41 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id oA411Ju8002913 for ; Wed, 3 Nov 2010 19:01:19 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oA41Cb3R147064 for ; Wed, 3 Nov 2010 19:12:37 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oA41CaqR008436 for ; Wed, 3 Nov 2010 19:12:36 -0600 From: Adam Litke In-Reply-To: <1288798090-7127-13-git-send-email-mdroth@linux.vnet.ibm.com> References: <1288798090-7127-1-git-send-email-mdroth@linux.vnet.ibm.com> <1288798090-7127-13-git-send-email-mdroth@linux.vnet.ibm.com> Content-Type: text/plain; charset="UTF-8" Date: Wed, 03 Nov 2010 20:12:34 -0500 Message-ID: <1288833154.2846.90.camel@aglitke> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [RFC][RESEND][PATCH v1 12/15] virtproxy: interfaces to set/remove VPIForwards List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: abeekhof@redhat.com, agl@linux.vnet.ibm.com, qemu-devel@nongnu.org, aliguori@linux.vnet.ibm.com Description please. On Wed, 2010-11-03 at 10:28 -0500, Michael Roth wrote: > 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 */ -- Thanks, Adam