From patchwork Wed Nov 3 15:28:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 70015 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 F11FE1007D2 for ; Thu, 4 Nov 2010 02:32:27 +1100 (EST) Received: from localhost ([127.0.0.1]:49653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDfK4-0002dS-DC for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2010 11:32:24 -0400 Received: from [140.186.70.92] (port=51677 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDfGh-0001Mi-BB for qemu-devel@nongnu.org; Wed, 03 Nov 2010 11:28:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDfGe-00073s-6G for qemu-devel@nongnu.org; Wed, 03 Nov 2010 11:28:54 -0400 Received: from e3.ny.us.ibm.com ([32.97.182.143]:32798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDfGe-00073f-3R for qemu-devel@nongnu.org; Wed, 03 Nov 2010 11:28:52 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e3.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oA3FBiPw025652 for ; Wed, 3 Nov 2010 11:11:44 -0400 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 oA3FSpnw153434 for ; Wed, 3 Nov 2010 11:28:51 -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 oA3FSotb008028 for ; Wed, 3 Nov 2010 11:28:51 -0400 Received: from localhost.localdomain (sig-9-76-99-21.mts.ibm.com [9.76.99.21]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oA3FSVDD005744; Wed, 3 Nov 2010 11:28:49 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 3 Nov 2010 10:28:03 -0500 Message-Id: <1288798090-7127-9-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1288798090-7127-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1288798090-7127-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: abeekhof@redhat.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, aliguori@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC][RESEND][PATCH v1 08/15] virtproxy: interfaces to set/remove/handle VPOForwards 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 Functions to add listener FDs (oforwards) which set up proxied connections to associated service, and the corresponding handler function to process to new connections to said FDs and initialize new client connections to the associated remote server over the channel Signed-off-by: Michael Roth --- virtproxy.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtproxy.h | 1 + 2 files changed, 104 insertions(+), 0 deletions(-) diff --git a/virtproxy.c b/virtproxy.c index cc0ac9a..6c3611b 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -12,6 +12,7 @@ */ #include "virtproxy.h" +#include "qemu_socket.h" #define DEBUG_VP @@ -314,6 +315,70 @@ static void vp_channel_read(void *opaque) } } +/* handler to accept() and init new client connections */ +static void vp_oforward_accept(void *opaque) +{ + VPOForward *f = opaque; + VPDriver *drv = f->drv; + + struct sockaddr_in saddr; + struct sockaddr *addr; + socklen_t len; + int fd, ret; + VPConn *conn = NULL; + VPPacket pkt; + VPControlMsg msg; + + TRACE("called with opaque: %p, drv: %p", f, drv); + + for(;;) { + len = sizeof(saddr); + addr = (struct sockaddr *)&saddr; + fd = qemu_accept(f->listen_fd, addr, &len); + + if (fd < 0 && errno != EINTR) { + TRACE("accept() failed"); + return; + } else if (fd >= 0) { + TRACE("accepted connection"); + break; + } + } + + if (drv->channel_fd == -1) { + TRACE("communication channel not open, closing connection"); + closesocket(fd); + return; + } + + /* send init packet over channel */ + memset(&msg, 0, sizeof(VPControlMsg)); + msg.type = VP_CONTROL_CONNECT_INIT; + msg.args.connect_init.client_fd = fd; + pstrcpy(msg.args.connect_init.service_id, VP_SERVICE_ID_LEN, f->service_id); + + memset(&pkt, 0, sizeof(VPPacket)); + pkt.type = VP_PKT_CONTROL; + pkt.payload.msg = msg; + pkt.magic = VP_MAGIC; + + ret = vp_send_all(drv->channel_fd, &pkt, sizeof(VPPacket)); + if (ret == -1) { + LOG("vp_send_all() failed"); + return; + } + + /* create new VPConn for client */ + conn = qemu_mallocz(sizeof(VPConn)); + conn->drv = drv; + conn->client_fd = fd; + conn->type = VP_CONN_CLIENT; + conn->state = VP_STATE_NEW; + QLIST_INSERT_HEAD(&drv->conns, conn, next); + + socket_set_nonblock(fd); +} + /* create/init VPDriver object */ VPDriver *vp_new(int fd, bool listen) { @@ -336,3 +401,41 @@ VPDriver *vp_new(int fd, bool listen) return drv; } + +/* set/modify/remove a service_id -> net/unix listening socket mapping + * + * "service_id" is a user-defined id for the service. this is what the + * client end will tag it's connections with so that the remote end can + * route it to the proper socket on the remote end. + * + * "fd" is a listen()'ing socket we want virtproxy to listen for new + * connections of this service type on. set "fd" to -1 to remove the + * existing listening socket for this "service_id" + */ +int vp_set_oforward(VPDriver *drv, int fd, const char *service_id) +{ + VPOForward *f = get_oforward(drv, service_id); + + if (fd == -1) { + if (f != NULL) { + vp_set_fd_handler(f->listen_fd, NULL, NULL, NULL); + QLIST_REMOVE(f, next); + qemu_free(f); + } + return 0; + } + + if (f == NULL) { + f = qemu_mallocz(sizeof(VPOForward)); + f->drv = drv; + strncpy(f->service_id, service_id, VP_SERVICE_ID_LEN); + QLIST_INSERT_HEAD(&drv->oforwards, f, next); + } else { + closesocket(f->listen_fd); + } + + f->listen_fd = fd; + vp_set_fd_handler(f->listen_fd, vp_oforward_accept, NULL, f); + + return 0; +} diff --git a/virtproxy.h b/virtproxy.h index 3df1691..39d5d40 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -33,5 +33,6 @@ 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); #endif /* VIRTPROXY_H */