From patchwork Wed Nov 10 22:28:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 70720 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 9C826B7112 for ; Thu, 11 Nov 2010 10:10:19 +1100 (EST) Received: from localhost ([127.0.0.1]:57318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGJo0-0005oH-85 for incoming@patchwork.ozlabs.org; Wed, 10 Nov 2010 18:10:16 -0500 Received: from [140.186.70.92] (port=42883 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGJDM-0008JZ-AD 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 1PGJ9n-0007qa-7e for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:28:44 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:57166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGJ9n-0007qV-51 for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:28:43 -0500 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAAMBqHD002875 for ; Wed, 10 Nov 2010 17:11:52 -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 oAAMSg6w093438 for ; Wed, 10 Nov 2010 17:28:42 -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 oAAMSfGn002798 for ; Wed, 10 Nov 2010 17:28:42 -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 oAAMSI5U001385; Wed, 10 Nov 2010 17:28:37 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 10 Nov 2010 16:28:05 -0600 Message-Id: <1289428095-5059-10-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 09/19] 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 | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtproxy.h | 1 + 2 files changed, 105 insertions(+), 0 deletions(-) diff --git a/virtproxy.c b/virtproxy.c index 401d51c..f189e2c 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -12,6 +12,7 @@ */ #include "virtproxy.h" +#include "qemu_socket.h" #define DEBUG_VP @@ -360,6 +361,71 @@ 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->chr && 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_channel_send_all(drv, (uint8_t*)&pkt, sizeof(VPPacket)); + if (ret == -1) { + LOG("error sending to channel"); + 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(enum vp_context ctx, CharDriverState *s, int fd, bool listen) { VPDriver *drv = NULL; @@ -399,3 +465,41 @@ out_bad: qemu_free(drv); return NULL; } + +/* 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 7cd2f76..e901600 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -40,5 +40,6 @@ void vp_chr_read(CharDriverState *s, uint8_t *buf, int len); /* virtproxy interface */ 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); #endif /* VIRTPROXY_H */