[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/5] Add "restrict" and "ip" option to "user" net
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCH v2 4/5] Add "restrict" and "ip" option to "user" net option |
Date: |
Mon, 05 Jan 2009 17:15:20 +0200 |
User-agent: |
StGIT/0.14.2 |
Expose new slirp capabilities to user through a command line options.
Signed-off-by: Gleb Natapov <address@hidden>
---
net.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/net.c b/net.c
index 3fa8776..6af4255 100644
--- a/net.c
+++ b/net.c
@@ -410,6 +410,8 @@ ssize_t qemu_sendv_packet(VLANClientState *vc1, const
struct iovec *iov,
/* slirp network adapter */
static int slirp_inited;
+static int slirp_restrict;
+static char *slirp_ip;
static VLANClientState *slirp_vc;
int slirp_can_output(void)
@@ -446,7 +448,7 @@ static int net_slirp_init(VLANState *vlan)
{
if (!slirp_inited) {
slirp_inited = 1;
- slirp_init(0, NULL);
+ slirp_init(slirp_restrict, slirp_ip);
}
slirp_vc = qemu_new_vlan_client(vlan,
slirp_receive, NULL, NULL);
@@ -464,7 +466,7 @@ void net_slirp_redir(const char *redir_str)
if (!slirp_inited) {
slirp_inited = 1;
- slirp_init(0, NULL);
+ slirp_init(slirp_restrict, slirp_ip);
}
p = redir_str;
@@ -550,7 +552,7 @@ void net_slirp_smb(const char *exported_dir)
if (!slirp_inited) {
slirp_inited = 1;
- slirp_init(0, NULL);
+ slirp_init(slirp_restrict, slirp_ip);
}
/* XXX: better tmp dir construction */
@@ -1487,6 +1489,12 @@ int net_client_init(const char *device, const char *p)
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);
} else
- [Qemu-devel] [PATCH v2 0/5] Marry slirp and qemu character device., Gleb Natapov, 2009/01/05
- [Qemu-devel] [PATCH v2 1/5] Redirect slirp traffic to/from qemu character device., Gleb Natapov, 2009/01/05
- [Qemu-devel] [PATCH v2 2/5] Add vmchannel command line option., Gleb Natapov, 2009/01/05
- [Qemu-devel] [PATCH v2 3/5] Add slirp_restrict option., Gleb Natapov, 2009/01/05
- [Qemu-devel] [PATCH v2 4/5] Add "restrict" and "ip" option to "user" net option,
Gleb Natapov <=
- [Qemu-devel] [PATCH v2 5/5] Add support for vmchannel socket migration., Gleb Natapov, 2009/01/05
- Re: [Qemu-devel] [PATCH v2 0/5] Marry slirp and qemu character device., Anthony Liguori, 2009/01/05
- Re: [Qemu-devel] [PATCH v2 0/5] Marry slirp and qemu character device., Anthony Liguori, 2009/01/05