From: Samuel Thibault Date: Sun, 29 Sep 2019 18:08:20 +0000 (+0200) Subject: slirp: Allow non-local DNS address when restrict is off X-Git-Tag: v4.2.0-rc0~68^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=120b721f5b590393971673a315f02969ec89cccb;p=qemu-xen-unstable.git slirp: Allow non-local DNS address when restrict is off This can be used to set a DNS server to be used by the guest which is different from the one configured on the host. Buglink: https://bugs.launchpad.net/qemu/+bug/1010484 Signed-off-by: Samuel Thibault Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- diff --git a/net/slirp.c b/net/slirp.c index f42f496641..c4334ee876 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -456,7 +456,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, error_setg(errp, "Failed to parse DNS"); return -1; } - if ((dns.s_addr & mask.s_addr) != net.s_addr) { + if (restricted && (dns.s_addr & mask.s_addr) != net.s_addr) { error_setg(errp, "DNS doesn't belong to network"); return -1; } @@ -522,7 +522,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, error_setg(errp, "Failed to parse IPv6 DNS"); return -1; } - if (!in6_equal_net(&ip6_prefix, &ip6_dns, vprefix6_len)) { + if (restricted && !in6_equal_net(&ip6_prefix, &ip6_dns, vprefix6_len)) { error_setg(errp, "IPv6 DNS doesn't belong to network"); return -1; }