slirp: Read host DNS config on demand
PATCH 1/1 slirp: Read host DNS config on demand
Currently the qemu user-mode networking stack reads the host DNS configuration (/etc/resolv.conf or the Windows equivalent) only once when qemu starts. This causes name lookups in the guest to fail if the host is moved to a different network from which the original DNS servers are unreachable, a common occurrence when the host is a laptop.
This patch changes the slirp code to read the host DNS configuration on demand, caching the results for 10 seconds to avoid unnecessary overhead if name lookups occur in rapid succession.
---
slirp/ip_icmp.c +2 -1
@@ -140,7 +140,8 @@ icmp_input(m, hlen)/* It's an alias */ switch (ntohl (so->so_faddr.s_addr) &0xff ) {case CTL_DNS : - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr;break ;case CTL_ALIAS :default :
slirp/libslirp.h +2 -0
@@ -5,6 +5,8 @@extern "C" {#endif +int get_dns_addr (struct in_addr *pdns_addr); +void slirp_init (int restrict,char *special_ip); void slirp_select_fill(int *pnfds,
slirp/main.h +0 -1
@@ -37,7 +37,6 @@ extern struct in_addr special_addr;extern struct in_addr alias_addr;extern struct in_addr our_addr;extern struct in_addr loopback_addr; -extern struct in_addr dns_addr;extern char *username;extern char *socket_path;extern int towrite_max;
slirp/slirp.c +21 -10
@@ -28,8 +28,6 @@/* host address */ struct in_addr our_addr; -/* host dns address */ -struct in_addr dns_addr;/* host loopback address */ struct in_addr loopback_addr;
@@ -61,9 +59,12 @@ fd_set *global_readfds, *global_writefdschar slirp_hostname[33 ]; +struct in_addr dns_addr = {0 }; +u_int dns_addr_time =0 ; +#ifdef _WIN32 -static int get_dns_addr (struct in_addr *pdns_addr) +int get_dns_addr (struct in_addr *pdns_addr) {FIXED_INFO *FixedInfo=NULL ;ULONG BufLen;
@@ -71,6 +72,11 @@ static int get_dns_addr(struct in_addr *IP_ADDR_STRING *pIPAddr;struct in_addr tmp_addr; +if (dns_addr.s_addr !=0 && (curtime - dns_addr_time) <10000 ) { + *pdns_addr = dns_addr; +return 0 ; + } + FixedInfo = (FIXED_INFO *)GlobalAlloc (GPTR ,sizeof (FIXED_INFO )); BufLen =sizeof (FIXED_INFO );
@@ -94,6 +100,8 @@ static int get_dns_addr(struct in_addr * pIPAddr = &(FixedInfo->DnsServerList);inet_aton (pIPAddr->IpAddress.String, &tmp_addr); *pdns_addr = tmp_addr; + dns_addr = tmp_addr; + dns_addr_time = curtime;#if 0 printf ("DNS Servers:\n" );printf ("DNS Addr:%s\n" , pIPAddr->IpAddress.String );
@@ -113,7 +121,7 @@ static int get_dns_addr(struct in_addr *#else -static int get_dns_addr (struct in_addr *pdns_addr) +int get_dns_addr (struct in_addr *pdns_addr) {char buff[512 ];char buff2[257 ];
@@ -121,6 +129,11 @@ static int get_dns_addr(struct in_addr *int found =0 ;struct in_addr tmp_addr; +if (dns_addr.s_addr !=0 && (curtime - dns_addr_time) <10000 ) { + *pdns_addr = dns_addr; +return 0 ; + } + f =fopen ("/etc/resolv.conf" ,"r" );if (!f)return -1 ;
@@ -135,8 +148,11 @@ static int get_dns_addr(struct in_addr *if (tmp_addr.s_addr == loopback_addr.s_addr) tmp_addr = our_addr;/* If it's the first one, set it to dns_addr */ -if (!found) +if (!found) { *pdns_addr = tmp_addr; + dns_addr = tmp_addr; + dns_addr_time = curtime; + }#ifdef DEBUG else lprint(", ");
@@ -195,11 +211,6 @@ void slirp_init(int restrict, char *spec/* set default addresses */ inet_aton ("127.0.0.1" , &loopback_addr); -if (get_dns_addr (&dns_addr) <0 ) { - dns_addr = loopback_addr; -fprintf (stderr,"Warning: No DNS servers found\n" ); - } -if (special_ip) slirp_special_ip = special_ip;
slirp/socket.c +2 -1
@@ -567,7 +567,8 @@ sosendto(so, m)/* It's an alias */ switch (ntohl (so->so_faddr.s_addr) &0xff ) {case CTL_DNS : - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr;break ;case CTL_ALIAS :default :
slirp/tcp_subr.c +2 -1
@@ -398,7 +398,8 @@ int tcp_fconnect(so)/* It's an alias */ switch (ntohl (so->so_faddr.s_addr) &0xff ) {case CTL_DNS : - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr;break ;case CTL_ALIAS :default :
Quoted 9 lines · Ed Swierk
Currently the qemu user-mode networking stack reads the host DNS configuration (
/etc/resolv.confor the Windows equivalent) only once when qemu starts. This causes name lookups in the guest to fail if the host is moved to a different network from which the original DNS servers are unreachable, a common occurrence when the host is a laptop.This patch changes the slirp code to read the host DNS configuration on demand, caching the results for 10 seconds to avoid unnecessary overhead if name lookups occur in rapid succession.
Nice. I noticed this, too, and shortly thought about some possible fixes. Don't know why I dropped it again. Anyway, your approach looks straightforward. Please rebase over git head, and I will happily test and ack it!
Thanks,
Jan
Quoted 4 lines · Jan Kiszka
Nice. I noticed this, too, and shortly thought about some possible fixes. Don't know why I dropped it again. Anyway, your approach looks straightforward. Please rebase over git head, and I will happily test and ack it!
FYI there are two other things that tend to break on laptops especially:
- If the system clock jumps backwards, functions that rely on gettimeofday() for computing a time interval get confused. gettimeofday() should be replaced with clock_gettime(CLOCK_MONOTONIC). Hopefully all Unixy platforms support it?
- Storing the address of some random host interface in our_addr is bad for the same reason as storing the address of the DNS server. Fortunately most references to our_addr are in dead code, and the remaining ones are questionable.
Anyway, here's the updated patch for the DNS issue.
-
Currently the qemu user-mode networking stack reads the host DNS configuration (/etc/resolv.conf or the Windows equivalent) only once when qemu starts. This causes name lookups in the guest to fail if the host is moved to a different network from which the original DNS servers are unreachable, a common occurrence when the host is a laptop.
This patch changes the slirp code to read the host DNS configuration on demand, caching the results for 10 seconds to avoid unnecessary overhead if name lookups occur in rapid succession.
---
slirp/ip_icmp.c +2 -1
@@ -127,7 +127,8 @@ icmp_input(struct mbuf *m, int hlen) slirp->vnetwork_addr.s_addr) {/* It's an alias */ if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) { - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr; }else { addr.sin_addr = loopback_addr; }
slirp/libslirp.h +2 -0
@@ -8,6 +8,8 @@struct Slirp ;typedef struct Slirp Slirp ; +int get_dns_addr (struct in_addr *pdns_addr); + Slirp *slirp_init(int restricted, struct in_addr vnetwork, struct in_addr vnetmask, struct in_addr vhost, const char *vhostname, const char *tftp_path,
slirp/main.h +0 -1
@@ -32,7 +32,6 @@ extern u_int curtime;extern fd_set *global_readfds, *global_writefds, *global_xfds;extern struct in_addr our_addr;extern struct in_addr loopback_addr; -extern struct in_addr dns_addr;extern char *username;extern char *socket_path;extern int towrite_max;
slirp/slirp.c +21 -10
@@ -28,8 +28,6 @@/* host address */ struct in_addr our_addr; -/* host dns address */ -struct in_addr dns_addr;/* host loopback address */ struct in_addr loopback_addr;
@@ -50,9 +48,12 @@ static int do_slowtimo; TAILQ_HEAD(slirp_instances, Slirp) slirp_instances =TAILQ_HEAD_INITIALIZER (slirp_instances); +struct in_addr dns_addr = {0 }; +u_int dns_addr_time =0 ; +#ifdef _WIN32 -static int get_dns_addr (struct in_addr *pdns_addr) +int get_dns_addr (struct in_addr *pdns_addr) {FIXED_INFO *FixedInfo=NULL ;ULONG BufLen;
@@ -60,6 +61,11 @@ static int get_dns_addr(struct in_addr *pdns_addr)IP_ADDR_STRING *pIPAddr;struct in_addr tmp_addr; +if (dns_addr.s_addr !=0 && (curtime - dns_addr_time) <10000 ) { + *pdns_addr = dns_addr; +return 0 ; + } + FixedInfo = (FIXED_INFO *)GlobalAlloc (GPTR ,sizeof (FIXED_INFO )); BufLen =sizeof (FIXED_INFO );
@@ -83,6 +89,8 @@ static int get_dns_addr(struct in_addr *pdns_addr) pIPAddr = &(FixedInfo->DnsServerList);inet_aton (pIPAddr->IpAddress.String, &tmp_addr); *pdns_addr = tmp_addr; + dns_addr = tmp_addr; + dns_addr_time = curtime;if (FixedInfo) {GlobalFree (FixedInfo); FixedInfo =NULL ;
@@ -97,7 +105,7 @@ static void winsock_cleanup(void)#else -static int get_dns_addr (struct in_addr *pdns_addr) +int get_dns_addr (struct in_addr *pdns_addr) {char buff[512 ];char buff2[257 ];
@@ -105,6 +113,11 @@ static int get_dns_addr(struct in_addr *pdns_addr)int found =0 ;struct in_addr tmp_addr; +if (dns_addr.s_addr !=0 && (curtime - dns_addr_time) <10000 ) { + *pdns_addr = dns_addr; +return 0 ; + } + f =fopen ("/etc/resolv.conf" ,"r" );if (!f)return -1 ;
@@ -119,8 +132,11 @@ static int get_dns_addr(struct in_addr *pdns_addr)if (tmp_addr.s_addr == loopback_addr.s_addr) tmp_addr = our_addr;/* If it's the first one, set it to dns_addr */ -if (!found) +if (!found) { *pdns_addr = tmp_addr; + dns_addr = tmp_addr; + dns_addr_time = curtime; + }#ifdef DEBUG else lprint(", ");
@@ -176,11 +192,6 @@ static void slirp_init_once(void)if (our_addr.s_addr ==0 ) { our_addr = loopback_addr; } - -/* FIXME: This address may change during runtime */ -if (get_dns_addr (&dns_addr) <0 ) { - dns_addr = loopback_addr; - } }static void slirp_state_save (QEMUFile *f,void *opaque);
slirp/socket.c +2 -1
@@ -552,7 +552,8 @@ sosendto(struct socket *so, struct mbuf *m) slirp->vnetwork_addr.s_addr) {/* It's an alias */ if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) { - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr; }else { addr.sin_addr = loopback_addr; }
slirp/tcp_subr.c +2 -1
@@ -340,7 +340,8 @@ int tcp_fconnect(struct socket *so) slirp->vnetwork_addr.s_addr) {/* It's an alias */ if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) { - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr; }else { addr.sin_addr = loopback_addr; }
Quoted 6 lines · Ed Swierk
Quoted 4 lines · Jan Kiszka
Nice. I noticed this, too, and shortly thought about some possible fixes. Don't know why I dropped it again. Anyway, your approach looks straightforward. Please rebase over git head, and I will happily test and ack it!
Quoted 6 lines
FYI there are two other things that tend to break on laptops especially:
- If the system clock jumps backwards, functions that rely on
gettimeofday()for computing a time interval get confused.gettimeofday()should be replaced withclock_gettime(CLOCK_MONOTONIC). Hopefully all Unixy platforms support it?
You mean that gettimeofday in updtime? Yes, that's only for timeout calculation IIRC and should be converted. Patch welcome.
Are there more? I didn't find any on quick scan.
Quoted 5 lines
- Storing the address of some random host interface in
our_addris bad for the same reason as storing the address of the DNS server. Fortunately most references toour_addrare in dead code, and the remaining ones are questionable.
True. I shortly thought about ripping all those historic UDP protocol emulations out, but then I didn't feel brave enough. I couldn't asses if they are still of any use for some qemu people (namely it's CUSEEME, the rest is disabled anyway). But maybe it's worth posting another cleanup patch.
Quoted 2 lines
Anyway, here's the updated patch for the DNS issue.
Thanks, will test.
Jan
Quoted 6 lines · Ed Swierk
Quoted 4 lines · Jan Kiszka
Nice. I noticed this, too, and shortly thought about some possible fixes. Don't know why I dropped it again. Anyway, your approach looks straightforward. Please rebase over git head, and I will happily test and ack it!
Quoted 6 lines
FYI there are two other things that tend to break on laptops especially:
- If the system clock jumps backwards, functions that rely on
gettimeofday()for computing a time interval get confused.gettimeofday()should be replaced withclock_gettime(CLOCK_MONOTONIC). Hopefully all Unixy platforms support it?
Nope.
[..snip..]
Signature · 1 line
mailto:[email protected]
Jan Kiszka
Acked-byQuoted 28 lines · Ed Swierk
Quoted 4 lines · Jan Kiszka
Nice. I noticed this, too, and shortly thought about some possible fixes. Don't know why I dropped it again. Anyway, your approach looks straightforward. Please rebase over git head, and I will happily test and ack it!
FYI there are two other things that tend to break on laptops especially:
- If the system clock jumps backwards, functions that rely on
gettimeofday()for computing a time interval get confused.gettimeofday()should be replaced withclock_gettime(CLOCK_MONOTONIC). Hopefully all Unixy platforms support it?- Storing the address of some random host interface in
our_addris bad for the same reason as storing the address of the DNS server. Fortunately most references toour_addrare in dead code, and the remaining ones are questionable.Anyway, here's the updated patch for the DNS issue.
-
Currently the qemu user-mode networking stack reads the host DNS configuration (
/etc/resolv.confor the Windows equivalent) only once when qemu starts. This causes name lookups in the guest to fail if the host is moved to a different network from which the original DNS servers are unreachable, a common occurrence when the host is a laptop.
Quoted 5 lines
This patch changes the slirp code to read the host DNS configuration on demand, caching the results for 10 seconds to avoid unnecessary overhead if name lookups occur in rapid succession.
Signed-off-by Ed Swierk <[email protected]>
Works as expected.
Quoted 165 lines
---
slirp/ip_icmp.c +2
-1@@ -127,7 +127,8 @@ icmp_input(struct mbuf *m, int hlen) slirp->vnetwork_addr.s_addr) {/* It's an alias */ if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) { - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr; }else { addr.sin_addr = loopback_addr; }slirp/libslirp.h +2
-0@@ -8,6 +8,8 @@struct Slirp ;typedef struct Slirp Slirp ; +int get_dns_addr (struct in_addr *pdns_addr); + Slirp *slirp_init(int restricted, struct in_addr vnetwork, struct in_addr vnetmask, struct in_addr vhost, const char *vhostname, const char *tftp_path,slirp/main.h +0
-1@@ -32,7 +32,6 @@ extern u_int curtime;extern fd_set *global_readfds, *global_writefds, *global_xfds;extern struct in_addr our_addr;extern struct in_addr loopback_addr; -extern struct in_addr dns_addr;extern char *username;extern char *socket_path;extern int towrite_max;slirp/slirp.c +21
-10@@ -28,8 +28,6 @@/* host address */ struct in_addr our_addr; -/* host dns address */ -struct in_addr dns_addr;/* host loopback address */ struct in_addr loopback_addr;@@ -50,9 +48,12 @@ static int do_slowtimo; TAILQ_HEAD(slirp_instances, Slirp) slirp_instances =TAILQ_HEAD_INITIALIZER (slirp_instances); +struct in_addr dns_addr = {0 }; +u_int dns_addr_time =0 ; +#ifdef _WIN32 -static int get_dns_addr (struct in_addr *pdns_addr) +int get_dns_addr (struct in_addr *pdns_addr) {FIXED_INFO *FixedInfo=NULL ;ULONG BufLen;@@ -60,6 +61,11 @@ static int get_dns_addr(struct in_addr *pdns_addr)IP_ADDR_STRING *pIPAddr;struct in_addr tmp_addr; +if (dns_addr.s_addr !=0 && (curtime - dns_addr_time) <10000 ) { + *pdns_addr = dns_addr; +return 0 ; + } + FixedInfo = (FIXED_INFO *)GlobalAlloc (GPTR ,sizeof (FIXED_INFO )); BufLen =sizeof (FIXED_INFO );@@ -83,6 +89,8 @@ static int get_dns_addr(struct in_addr *pdns_addr) pIPAddr = &(FixedInfo->DnsServerList);inet_aton (pIPAddr->IpAddress.String, &tmp_addr); *pdns_addr = tmp_addr; + dns_addr = tmp_addr; + dns_addr_time = curtime;if (FixedInfo) {GlobalFree (FixedInfo); FixedInfo =NULL ;@@ -97,7 +105,7 @@ static void winsock_cleanup(void)#else -static int get_dns_addr (struct in_addr *pdns_addr) +int get_dns_addr (struct in_addr *pdns_addr) {char buff[512 ];char buff2[257 ];@@ -105,6 +113,11 @@ static int get_dns_addr(struct in_addr *pdns_addr)int found =0 ;struct in_addr tmp_addr; +if (dns_addr.s_addr !=0 && (curtime - dns_addr_time) <10000 ) { + *pdns_addr = dns_addr; +return 0 ; + } + f =fopen ("/etc/resolv.conf" ,"r" );if (!f)return -1 ;@@ -119,8 +132,11 @@ static int get_dns_addr(struct in_addr *pdns_addr)if (tmp_addr.s_addr == loopback_addr.s_addr) tmp_addr = our_addr;/* If it's the first one, set it to dns_addr */ -if (!found) +if (!found) { *pdns_addr = tmp_addr; + dns_addr = tmp_addr; + dns_addr_time = curtime; + }#ifdef DEBUG else lprint(", ");@@ -176,11 +192,6 @@ static void slirp_init_once(void)if (our_addr.s_addr ==0 ) { our_addr = loopback_addr; } - -/* FIXME: This address may change during runtime */ -if (get_dns_addr (&dns_addr) <0 ) { - dns_addr = loopback_addr; - } }static void slirp_state_save (QEMUFile *f,void *opaque);slirp/socket.c +2
-1@@ -552,7 +552,8 @@ sosendto(struct socket *so, struct mbuf *m) slirp->vnetwork_addr.s_addr) {/* It's an alias */ if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) { - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr; }else { addr.sin_addr = loopback_addr; }slirp/tcp_subr.c +2
-1@@ -340,7 +340,8 @@ int tcp_fconnect(struct socket *so) slirp->vnetwork_addr.s_addr) {/* It's an alias */ if (so->so_faddr.s_addr == slirp->vnameserver_addr.s_addr) { - addr.sin_addr = dns_addr; +if (get_dns_addr (&addr.sin_addr) <0 ) + addr.sin_addr = loopback_addr; }else { addr.sin_addr = loopback_addr; }