From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LL0WQ-0001fa-2B
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:26:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LL0WP-0001f5-AF
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:26:25 -0500
Received: from [199.232.76.173] (port=33885 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LL0WP-0001f1-5W
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:26:25 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60958 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LL0WO-0004Fh-Pz
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:26:24 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LL0WN-0006M4-TS
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 19:26:24 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LL0WN-0006M0-BN
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 19:26:23 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LL0WN-0006M0-BN@cvs.savannah.gnu.org>
Date: Thu, 08 Jan 2009 19:26:23 +0000
Subject: [Qemu-devel] [6242] Add "restrict" and "ip" option to "user" net
	option (Gleb Natapov)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6242
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6242
Author:   aliguori
Date:     2009-01-08 19:26:22 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Add "restrict" and "ip" option to "user" net option (Gleb Natapov)

Expose new slirp capabilities to user through a command line options.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/net.c

Modified: trunk/net.c
===================================================================
--- trunk/net.c	2009-01-08 19:24:00 UTC (rev 6241)
+++ trunk/net.c	2009-01-08 19:26:22 UTC (rev 6242)
@@ -447,6 +447,8 @@
 /* slirp network adapter */
 
 static int slirp_inited;
+static int slirp_restrict;
+static char *slirp_ip;
 static VLANClientState *slirp_vc;
 
 int slirp_can_output(void)
@@ -483,7 +485,7 @@
 {
     if (!slirp_inited) {
         slirp_inited = 1;
-        slirp_init(0, NULL);
+        slirp_init(slirp_restrict, slirp_ip);
     }
     slirp_vc = qemu_new_vlan_client(vlan, model, name,
                                     slirp_receive, NULL, NULL);
@@ -501,7 +503,7 @@
 
     if (!slirp_inited) {
         slirp_inited = 1;
-        slirp_init(0, NULL);
+        slirp_init(slirp_restrict, slirp_ip);
     }
 
     p = redir_str;
@@ -587,7 +589,7 @@
 
     if (!slirp_inited) {
         slirp_inited = 1;
-        slirp_init(0, NULL);
+        slirp_init(slirp_restrict, slirp_ip);
     }
 
     /* XXX: better tmp dir construction */
@@ -1554,6 +1556,12 @@
         if (get_param_value(buf, sizeof(buf), "hostname", p)) {
             pstrcpy(slirp_hostname, sizeof(slirp_hostname), buf);
         }
+        if (get_param_value(buf, sizeof(buf), "restrict", p)) {
+            slirp_restrict = (buf[0] == 'y') ? 1 : 0;
+        }
+        if (get_param_value(buf, sizeof(buf), "ip", p)) {
+            slirp_ip = strdup(buf);
+        }
         vlan->nb_host_devs++;
         ret = net_slirp_init(vlan, device, name);
     } else