From patchwork Thu Sep 10 15:18:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 33331 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 bilbo.ozlabs.org (Postfix) with ESMTPS id CF3E7B6F31 for ; Fri, 11 Sep 2009 01:45:06 +1000 (EST) Received: from localhost ([127.0.0.1]:47220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MllpX-0006R1-MQ for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 11:45:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MllY2-0006JH-O0 for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MllXu-0006DZ-3i for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:54 -0400 Received: from [199.232.76.173] (port=40185 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MllXt-0006D1-4V for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:49 -0400 Received: from mail01.svc.cra.dublin.eircom.net ([159.134.118.17]:42600) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MllXq-00007p-PZ for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:48 -0400 Received: (qmail 47278 messnum 5478312 invoked from network[83.71.108.236/83-71-108-236-dynamic.b-ras1.srl.dublin.eircom.net]); 10 Sep 2009 15:20:06 -0000 Received: from 83-71-108-236-dynamic.b-ras1.srl.dublin.eircom.net (HELO blaa.localdomain) (83.71.108.236) by mail01.svc.cra.dublin.eircom.net (qp 47278) with SMTP; 10 Sep 2009 15:20:06 -0000 Received: by blaa.localdomain (Postfix, from userid 500) id ACCD241A88; Thu, 10 Sep 2009 16:19:01 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 16:18:52 +0100 Message-Id: <1252595941-15196-11-git-send-email-markmc@redhat.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1252595941-15196-1-git-send-email-markmc@redhat.com> References: <1252595941-15196-1-git-send-email-markmc@redhat.com> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 10/19] Port -net user to QemuOpts 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 The handling of guestfwd and hostfwd requires the previous changes to allow multiple values for each parameter. The only way to access those multiple values is to use qemu_opt_foreach(). Signed-off-by: Mark McLoughlin --- net.c | 250 +++++++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 149 insertions(+), 101 deletions(-) diff --git a/net.c b/net.c index b002ae5..aa5a677 100644 --- a/net.c +++ b/net.c @@ -2450,6 +2450,90 @@ static int net_init_nic(QemuOpts *opts, Monitor *mon) return idx; } +static int net_init_slirp_configs(const char *name, const char *value, void *opaque) +{ + struct slirp_config_str *config; + + if (strcmp(name, "hostfwd") != 0 && strcmp(name, "guestfwd") != 0) + return 0; + + config = qemu_mallocz(sizeof(*config)); + + pstrcpy(config->str, sizeof(config->str), value); + + if (!strcmp(name, "hostfwd")) + config->flags = SLIRP_CFG_HOSTFWD; + + config->next = slirp_configs; + slirp_configs = config; + + return 0; +} + +static int net_init_slirp(QemuOpts *opts, Monitor *mon) +{ + VLANState *vlan; + const char *name; + const char *vhost; + const char *vhostname; + const char *vdhcp_start; + const char *vnamesrv; + const char *tftp_export; + const char *bootfile; + const char *smb_export; + const char *vsmbsrv; + char *vnet = NULL; + int restricted = 0; + int ret; + + vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); + + name = qemu_opt_get(opts, "name"); + + vhost = qemu_opt_get(opts, "host"); + vhostname = qemu_opt_get(opts, "hostname"); + vdhcp_start = qemu_opt_get(opts, "dhcpstart"); + vnamesrv = qemu_opt_get(opts, "dns"); + tftp_export = qemu_opt_get(opts, "tftp"); + bootfile = qemu_opt_get(opts, "bootfile"); + smb_export = qemu_opt_get(opts, "smb"); + vsmbsrv = qemu_opt_get(opts, "smbserver"); + + if (qemu_opt_get(opts, "ip")) { + const char *ip = qemu_opt_get(opts, "ip"); + int l = strlen(ip) + strlen("/24") + 1; + + vnet = qemu_malloc(l); + + /* emulate legacy ip= parameter */ + pstrcpy(vnet, l, ip); + pstrcat(vnet, l, "/24"); + } + + if (qemu_opt_get(opts, "net")) { + if (vnet) + qemu_free(vnet); + vnet = qemu_strdup(qemu_opt_get(opts, "net")); + } + + if (qemu_opt_get(opts, "restrict") && + qemu_opt_get(opts, "restrict")[0] == 'y') + restricted = 1; + + qemu_opt_foreach(opts, net_init_slirp_configs, NULL, 0); + + ret = net_slirp_init(mon, vlan, "user", name, restricted, vnet, vhost, + vhostname, tftp_export, bootfile, vdhcp_start, + vnamesrv, smb_export, vsmbsrv); + + if (ret != -1) + vlan->nb_host_devs++; + + qemu_free(vnet); + + return ret; +} + #define NET_COMMON_PARAMS_DESC \ { \ .name = "type", \ @@ -2505,6 +2589,68 @@ static struct { }, { /* end of list */ } }, +#ifdef CONFIG_SLIRP + }, { + .type = "user", + .init = net_init_slirp, + .desc = { + NET_COMMON_PARAMS_DESC, + { + .name = "hostname", + .type = QEMU_OPT_STRING, + .help = "client hostname reported by the builtin DHCP server", + }, { + .name = "restrict", + .type = QEMU_OPT_STRING, + .help = "isolate the guest from the host (y|yes|n|no)", + }, { + .name = "ip", + .type = QEMU_OPT_STRING, + .help = "legacy parameter, use net= instead", + }, { + .name = "net", + .type = QEMU_OPT_STRING, + .help = "IP address and optional netmask", + }, { + .name = "host", + .type = QEMU_OPT_STRING, + .help = "guest-visible address of the host", + }, { + .name = "tftp", + .type = QEMU_OPT_STRING, + .help = "root directory of the built-in TFTP server", + }, { + .name = "bootfile", + .type = QEMU_OPT_STRING, + .help = "BOOTP filename, for use with tftp=", + }, { + .name = "dhcpstart", + .type = QEMU_OPT_STRING, + .help = "the first of the 16 IPs the built-in DHCP server can assign", + }, { + .name = "dns", + .type = QEMU_OPT_STRING, + .help = "guest-visible address of the virtual nameserver", + }, { + .name = "smb", + .type = QEMU_OPT_STRING, + .help = "root directory of the built-in SMB server", + }, { + .name = "smbserver", + .type = QEMU_OPT_STRING, + .help = "IP address of the built-in SMB server", + }, { + .name = "hostfwd", + .type = QEMU_OPT_STRING, + .help = "guest port number to forward incoming TCP or UDP connections", + }, { + .name = "guestfwd", + .type = QEMU_OPT_STRING, + .help = "IP address and port to forward guest TCP connections", + }, + { /* end of list */ } + }, +#endif }, { /* end of list */ } }; @@ -2544,7 +2690,8 @@ int net_client_init(Monitor *mon, const char *device, const char *p) char *name = NULL; if (!strcmp(device, "none") || - !strcmp(device, "nic")) { + !strcmp(device, "nic") || + !strcmp(device, "user")) { QemuOpts *opts; opts = qemu_opts_parse(&qemu_net_opts, p, NULL); @@ -2567,106 +2714,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p) } #ifdef CONFIG_SLIRP - if (!strcmp(device, "user")) { - static const char * const slirp_params[] = { - "vlan", "name", "hostname", "restrict", "ip", "net", "host", - "tftp", "bootfile", "dhcpstart", "dns", "smb", "smbserver", - "hostfwd", "guestfwd", NULL - }; - struct slirp_config_str *config; - int restricted = 0; - char *vnet = NULL; - char *vhost = NULL; - char *vhostname = NULL; - char *tftp_export = NULL; - char *bootfile = NULL; - char *vdhcp_start = NULL; - char *vnamesrv = NULL; - char *smb_export = NULL; - char *vsmbsrv = NULL; - const char *q; - - if (check_params(buf, sizeof(buf), slirp_params, p) < 0) { - config_error(mon, "invalid parameter '%s' in '%s'\n", buf, p); - ret = -1; - goto out; - } - if (get_param_value(buf, sizeof(buf), "ip", p)) { - int vnet_buflen = strlen(buf) + strlen("/24") + 1; - /* emulate legacy parameter */ - vnet = qemu_malloc(vnet_buflen); - pstrcpy(vnet, vnet_buflen, buf); - pstrcat(vnet, vnet_buflen, "/24"); - } - if (get_param_value(buf, sizeof(buf), "net", p)) { - vnet = qemu_strdup(buf); - } - if (get_param_value(buf, sizeof(buf), "host", p)) { - vhost = qemu_strdup(buf); - } - if (get_param_value(buf, sizeof(buf), "hostname", p)) { - vhostname = qemu_strdup(buf); - } - if (get_param_value(buf, sizeof(buf), "restrict", p)) { - restricted = (buf[0] == 'y') ? 1 : 0; - } - if (get_param_value(buf, sizeof(buf), "dhcpstart", p)) { - vdhcp_start = qemu_strdup(buf); - } - if (get_param_value(buf, sizeof(buf), "dns", p)) { - vnamesrv = qemu_strdup(buf); - } - if (get_param_value(buf, sizeof(buf), "tftp", p)) { - tftp_export = qemu_strdup(buf); - } - if (get_param_value(buf, sizeof(buf), "bootfile", p)) { - bootfile = qemu_strdup(buf); - } - if (get_param_value(buf, sizeof(buf), "smb", p)) { - smb_export = qemu_strdup(buf); - if (get_param_value(buf, sizeof(buf), "smbserver", p)) { - vsmbsrv = qemu_strdup(buf); - } - } - q = p; - while (1) { - config = qemu_malloc(sizeof(*config)); - if (!get_next_param_value(config->str, sizeof(config->str), - "hostfwd", &q)) { - break; - } - config->flags = SLIRP_CFG_HOSTFWD; - config->next = slirp_configs; - slirp_configs = config; - config = NULL; - } - q = p; - while (1) { - config = qemu_malloc(sizeof(*config)); - if (!get_next_param_value(config->str, sizeof(config->str), - "guestfwd", &q)) { - break; - } - config->flags = 0; - config->next = slirp_configs; - slirp_configs = config; - config = NULL; - } - qemu_free(config); - vlan->nb_host_devs++; - ret = net_slirp_init(mon, vlan, device, name, restricted, vnet, vhost, - vhostname, tftp_export, bootfile, vdhcp_start, - vnamesrv, smb_export, vsmbsrv); - qemu_free(vnet); - qemu_free(vhost); - qemu_free(vhostname); - qemu_free(tftp_export); - qemu_free(bootfile); - qemu_free(vdhcp_start); - qemu_free(vnamesrv); - qemu_free(smb_export); - qemu_free(vsmbsrv); - } else if (!strcmp(device, "channel")) { + if (!strcmp(device, "channel")) { if (TAILQ_EMPTY(&slirp_stacks)) { struct slirp_config_str *config;