* [PULL 0/1] slirp update
@ 2019-10-06 23:55 Samuel Thibault
2019-10-06 23:55 ` [PULL 1/1] slirp: Allow non-local DNS address when restrict is off Samuel Thibault
2019-10-08 11:29 ` [PULL 0/1] slirp update Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Samuel Thibault @ 2019-10-06 23:55 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Samuel Thibault
The following changes since commit 860d9048c78ce59c5903c3d5209df56f38400986:
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190924-pull-request' into staging (2019-09-24 13:51:51 +0100)
are available in the Git repository at:
https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
for you to fetch changes up to 120b721f5b590393971673a315f02969ec89cccb:
slirp: Allow non-local DNS address when restrict is off (2019-10-01 19:03:08 +0200)
----------------------------------------------------------------
slirp: Allow non-local DNS address when restrict is off
----------------------------------------------------------------
Samuel Thibault (1):
slirp: Allow non-local DNS address when restrict is off
net/slirp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] slirp: Allow non-local DNS address when restrict is off
2019-10-06 23:55 [PULL 0/1] slirp update Samuel Thibault
@ 2019-10-06 23:55 ` Samuel Thibault
2019-10-08 11:29 ` [PULL 0/1] slirp update Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Samuel Thibault @ 2019-10-06 23:55 UTC (permalink / raw)
To: qemu-devel, peter.maydell
Cc: Samuel Thibault, Thomas Huth, Philippe Mathieu-Daudé
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 <samuel.thibault@ens-lyon.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
net/slirp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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;
}
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/1] slirp update
2019-10-06 23:55 [PULL 0/1] slirp update Samuel Thibault
2019-10-06 23:55 ` [PULL 1/1] slirp: Allow non-local DNS address when restrict is off Samuel Thibault
@ 2019-10-08 11:29 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2019-10-08 11:29 UTC (permalink / raw)
To: Samuel Thibault; +Cc: QEMU Developers
On Mon, 7 Oct 2019 at 00:55, Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
>
> The following changes since commit 860d9048c78ce59c5903c3d5209df56f38400986:
>
> Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190924-pull-request' into staging (2019-09-24 13:51:51 +0100)
>
> are available in the Git repository at:
>
> https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>
> for you to fetch changes up to 120b721f5b590393971673a315f02969ec89cccb:
>
> slirp: Allow non-local DNS address when restrict is off (2019-10-01 19:03:08 +0200)
>
> ----------------------------------------------------------------
> slirp: Allow non-local DNS address when restrict is off
>
> ----------------------------------------------------------------
> Samuel Thibault (1):
> slirp: Allow non-local DNS address when restrict is off
>
> net/slirp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-08 11:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-06 23:55 [PULL 0/1] slirp update Samuel Thibault
2019-10-06 23:55 ` [PULL 1/1] slirp: Allow non-local DNS address when restrict is off Samuel Thibault
2019-10-08 11:29 ` [PULL 0/1] slirp update Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).