From patchwork Sat Jun 4 06:12:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 98761 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 08E50B6F80 for ; Sun, 5 Jun 2011 21:13:10 +1000 (EST) Received: from localhost ([::1]:37939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTBGU-0003as-OZ for incoming@patchwork.ozlabs.org; Sun, 05 Jun 2011 07:13:06 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTBEE-0003ak-Uv for qemu-devel@nongnu.org; Sun, 05 Jun 2011 07:10:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTBED-0004uS-MF for qemu-devel@nongnu.org; Sun, 05 Jun 2011 07:10:46 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60189 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTBED-0004uL-DL for qemu-devel@nongnu.org; Sun, 05 Jun 2011 07:10:45 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 94007867E2; Sun, 5 Jun 2011 13:10:43 +0200 (CEST) From: Alexander Graf To: "qemu-devel@nongnu.org Developers" Date: Sat, 4 Jun 2011 08:12:52 +0200 Message-Id: <1307167972-4759-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Mark McLoughlin , Anthony Liguori , =?utf-8?q?Ren=C3=A9=20Rebe?= , Sascha Wilde Subject: [Qemu-devel] [PATCH] slirp: add 'cmd:' target for guestfwd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When using guestfwd=, Qemu only connects the virtual server's TCP port to a single chardev. This is useless in most cases, as we usually want to have more than a single connection from the guest to the outside world. This patch adds a new cmd: target to guestfwd= that allows for execution of a command on every TCP connection. This leverages the same code as the -smb parameter, just that here the command is user defined. Reported-by: Sascha Wilde Signed-off-by: Alexander Graf --- net/slirp.c | 44 ++++++++++++++++++++++++++++---------------- qemu-options.hx | 20 +++++++++++++++++++- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index e057a14..4e4e3c3 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -615,25 +615,37 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, fwd = qemu_malloc(sizeof(struct GuestFwd)); snprintf(buf, sizeof(buf), "guestfwd.tcp.%d", port); - fwd->hd = qemu_chr_open(buf, p, NULL); - if (!fwd->hd) { - error_report("could not open guest forwarding device '%s'", buf); - qemu_free(fwd); - return -1; - } - if (slirp_add_exec(s->slirp, 3, fwd->hd, &server, port) < 0) { - error_report("conflicting/invalid host:port in guest forwarding " - "rule '%s'", config_str); - qemu_free(fwd); - return -1; + if ((strlen(p) > 4) && !strncmp(p, "cmd:", 4)) { + if (slirp_add_exec(s->slirp, 0, &p[4], &server, port) < 0) { + error_report("conflicting/invalid host:port in guest forwarding " + "rule '%s'", config_str); + qemu_free(fwd); + return -1; + } + } else { + fwd->hd = qemu_chr_open(buf, p, NULL); + if (!fwd->hd) { + error_report("could not open guest forwarding device '%s'", buf); + qemu_free(fwd); + return -1; + } + + if (slirp_add_exec(s->slirp, 3, fwd->hd, &server, port) < 0) { + error_report("conflicting/invalid host:port in guest forwarding " + "rule '%s'", config_str); + qemu_free(fwd); + return -1; + } + + fwd->server = server; + fwd->port = port; + fwd->slirp = s->slirp; + + qemu_chr_add_handlers(fwd->hd, guestfwd_can_read, guestfwd_read, + NULL, fwd); } - fwd->server = server; - fwd->port = port; - fwd->slirp = s->slirp; - qemu_chr_add_handlers(fwd->hd, guestfwd_can_read, guestfwd_read, - NULL, fwd); return 0; fail_syntax: diff --git a/qemu-options.hx b/qemu-options.hx index 82e085a..cc62d20 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1242,10 +1242,28 @@ telnet localhost 5555 Then when you use on the host @code{telnet localhost 5555}, you connect to the guest telnet server. -@item guestfwd=[tcp]:@var{server}:@var{port}-@var{dev} +@item guestfwd=[tcp]:@var{server}:@var{port}-[@var{dev}|@var{cmd:command}] Forward guest TCP connections to the IP address @var{server} on port @var{port} to the character device @var{dev}. This option can be given multiple times. +You can either use a chardev directly and have that one used throughout Qemu's +lifetime, like in the following example: + +@example +# open 10.10.1.1:4321 on bootup, connect 10.0.2.100:1234 to it whenever +# the guest accesses it +qemu -net user,guestfwd=tcp:10.0.2.100:1234-tcp:10.10.1.1:4321 [...] +@end example + +Or you can execute a command on every TCP connection established by the guest, +so that Qemu behaves similar to an inetd process for that virtual server: + +@example +# call "netcat 10.10.1.1 4321" on every TCP connection to 10.0.2.100:1234 +# and connect the TCP stream to its stdin/stdout +qemu -net user,guestfwd=tcp:10.0.2.100:1234-cmd:netcat 10.10.1.1 4321 +@end example + @end table Note: Legacy stand-alone options -tftp, -bootp, -smb and -redir are still