From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjUYQ-0006xJ-NM for qemu-devel@nongnu.org; Mon, 03 Jun 2013 09:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjUYK-0002ZK-G9 for qemu-devel@nongnu.org; Mon, 03 Jun 2013 09:12:06 -0400 Received: from mail.quarantainenet.nl ([91.220.21.66]:60395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjUYK-0002Yj-9w for qemu-devel@nongnu.org; Mon, 03 Jun 2013 09:12:00 -0400 From: Bas van Sisseren Date: Mon, 3 Jun 2013 15:11:49 +0200 Message-Id: <1370265109-8753-1-git-send-email-bas@quarantainenet.nl> Subject: [Qemu-devel] [PATCH] [slirp] fix -net user checks by reordering checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Qemu-devel Cc: Bas van Sisseren reorder slirp config options. first check the dns-server-address, then check the first-dhcp-address. the original code was comparing the first-dhcp-address with the default dns-server-address, not the configured dns-server-address. Signed-off-by: Bas van Sisseren --- net/slirp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index b3f35d5..124e953 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -212,19 +212,19 @@ static int net_slirp_init(NetClientState *peer, const char *model, return -1; } - if (vdhcp_start && !inet_aton(vdhcp_start, &dhcp)) { + if (vnameserver && !inet_aton(vnameserver, &dns)) { return -1; } - if ((dhcp.s_addr & mask.s_addr) != net.s_addr || - dhcp.s_addr == host.s_addr || dhcp.s_addr == dns.s_addr) { + if ((dns.s_addr & mask.s_addr) != net.s_addr || + dns.s_addr == host.s_addr) { return -1; } - if (vnameserver && !inet_aton(vnameserver, &dns)) { + if (vdhcp_start && !inet_aton(vdhcp_start, &dhcp)) { return -1; } - if ((dns.s_addr & mask.s_addr) != net.s_addr || - dns.s_addr == host.s_addr) { + if ((dhcp.s_addr & mask.s_addr) != net.s_addr || + dhcp.s_addr == host.s_addr || dhcp.s_addr == dns.s_addr) { return -1; } -- 1.7.10.4