From 8d6249a73adefb2468154b7da70c61b23e393d5b Mon Sep 17 00:00:00 2001 From: aliguori Date: Tue, 21 Apr 2009 20:49:11 +0000 Subject: net: Prevent multiple slirp instances (Jan Kiszka) The slirp stack is full of global variables which prevents instantiating it more than once. Catch this during net_slirp_init to prevent more harm later on. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7208 c046a42c-6fe2-441c-8c8c-71466251a162 --- net.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'net.c') diff --git a/net.c b/net.c index aa196a3da0..db2f8d345e 100644 --- a/net.c +++ b/net.c @@ -544,15 +544,27 @@ static void slirp_receive(void *opaque, const uint8_t *buf, int size) slirp_input(buf, size); } +static int slirp_in_use; + +static void net_slirp_cleanup(VLANClientState *vc) +{ + slirp_in_use = 0; +} + static int net_slirp_init(VLANState *vlan, const char *model, const char *name) { + if (slirp_in_use) { + /* slirp only supports a single instance so far */ + return -1; + } if (!slirp_inited) { slirp_inited = 1; slirp_init(slirp_restrict, slirp_ip); } slirp_vc = qemu_new_vlan_client(vlan, model, name, - slirp_receive, NULL, NULL, NULL); + slirp_receive, NULL, net_slirp_cleanup, NULL); slirp_vc->info_str[0] = '\0'; + slirp_in_use = 1; return 0; } -- cgit v1.2.1