From patchwork Sat Apr 29 22:01:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 756790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wFl675jnYz9s2G for ; Sun, 30 Apr 2017 08:02:22 +1000 (AEST) Received: from localhost ([::1]:42609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4aRW-0008Vc-D6 for incoming@patchwork.ozlabs.org; Sat, 29 Apr 2017 18:02:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4aRE-0008Tf-UY for qemu-devel@nongnu.org; Sat, 29 Apr 2017 18:02:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4aRD-0002UY-Vm for qemu-devel@nongnu.org; Sat, 29 Apr 2017 18:02:01 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:56135) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4aRD-0002Sw-LI for qemu-devel@nongnu.org; Sat, 29 Apr 2017 18:01:59 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 25666BAAD; Sun, 30 Apr 2017 00:01:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WmsVNpwgKoSA; Sun, 30 Apr 2017 00:01:57 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:181:c200:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id F0DD7BA86; Sun, 30 Apr 2017 00:01:56 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.89) (envelope-from ) id 1d4aRA-0004UH-1u; Sun, 30 Apr 2017 00:01:56 +0200 Date: Sun, 30 Apr 2017 00:01:56 +0200 From: Samuel Thibault To: FONNEMANN Mark Message-ID: <20170429220156.bb4hdlsaf6zzqmtw@var.youpi.perso.aquilenet.fr> References: <20170429124421.2qcthvlsiwvtqov2@var.youpi.perso.aquilenet.fr> <20170429171002.enxmz5dtuzhrxuc6@var.youpi.perso.aquilenet.fr> <20170429191402.ebsdilnya67ispla@var.youpi.perso.aquilenet.fr> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Organization: I am not organized User-Agent: NeoMutt/20170113 (1.7.2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:474::1 Subject: Re: [Qemu-devel] dns server not working in QEMU using usermode networking (SLIRP) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil , Thomas Huth , "qemu-devel@nongnu.org" , MCDONALD Margaret Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" FONNEMANN Mark, on sam. 29 avril 2017 20:06:09 +0000, wrote: > [mfonnemann@localhost qemu]$ /usr/local/bin/qemu-system-i386 -display curses -readconfig qemu.cfg -D logfile Ah, you are using curses... I've been putting logs onto stderr for simplicity, not the proper qemu logs. Here is a fixed patch to get output in the log. Samuel --- a/slirp/socket.c +++ b/slirp/socket.c @@ -6,6 +6,7 @@ */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qemu-common.h" #include "slirp.h" #include "ip_icmp.h" @@ -814,11 +815,18 @@ void sotranslate_out(struct socket *so, switch (addr->ss_family) { case AF_INET: + qemu_log("translating %x against %x %x\n", + so->so_faddr.s_addr, + slirp->vnetwork_mask.s_addr, + slirp->vnameserver_addr.s_addr); if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) == slirp->vnetwork_addr.s_addr) { /* It's an alias */ + qemu_log("it's an alias\n"); if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) { + qemu_log("it's DNS\n"); if (get_dns_addr(&sin->sin_addr) < 0) { + qemu_log("didn't get DNS address"); sin->sin_addr = loopback_addr; } } else { --- a/slirp/udp.c +++ b/slirp/udp.c @@ -39,6 +39,7 @@ */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "slirp.h" #include "ip_icmp.h" @@ -133,6 +134,10 @@ udp_input(register struct mbuf *m, int i lhost4->sin_addr = ip->ip_src; lhost4->sin_port = uh->uh_sport; + if (ntohs(uh->uh_dport) == 53 && + ip->ip_dst.s_addr == slirp->vnameserver_addr.s_addr) + qemu_log("UDP packet for DNS server\n"); + /* * handle DHCP/BOOTP */ --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qemu-common.h" #include "qemu/timer.h" #include "qemu/error-report.h" @@ -165,6 +166,7 @@ static int get_dns_addr_resolv_conf(int #endif while (fgets(buff, 512, f) != NULL) { if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1) { + qemu_log("got resolv.conf entry '%s'\n", buff2); char *c = strchr(buff2, '%'); if (c) { if_index = if_nametoindex(c + 1); @@ -174,10 +176,16 @@ static int get_dns_addr_resolv_conf(int } if (!inet_pton(af, buff2, tmp_addr)) { + qemu_log("couldn't parse it as %d\n", af); continue; } /* If it's the first one, set it to dns_addr */ if (!found) { + if (af == AF_INET) + { + struct in_addr *in = tmp_addr; + qemu_log("parsed %x\n", in->s_addr); + } memcpy(pdns_addr, tmp_addr, addrlen); memcpy(cached_addr, tmp_addr, addrlen); if (scope_id) { @@ -219,6 +227,7 @@ int get_dns_addr(struct in_addr *pdns_ad if (dns_addr.s_addr != 0) { int ret; + qemu_log("dns_addr is cached: %x\n", dns_addr.s_addr); ret = get_dns_addr_cached(pdns_addr, &dns_addr, sizeof(dns_addr), &dns_addr_stat, &dns_addr_time); if (ret <= 0) {