diff options
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/ip_icmp.c | 3 | ||||
| -rw-r--r-- | slirp/libslirp.h | 2 | ||||
| -rw-r--r-- | slirp/main.h | 1 | ||||
| -rw-r--r-- | slirp/slirp.c | 46 | ||||
| -rw-r--r-- | slirp/socket.c | 3 | ||||
| -rw-r--r-- | slirp/tcp_subr.c | 3 |
6 files changed, 44 insertions, 14 deletions
diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c index 95a4b39a4e..751a8e249a 100644 --- a/slirp/ip_icmp.c +++ b/slirp/ip_icmp.c @@ -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; } diff --git a/slirp/libslirp.h b/slirp/libslirp.h index 93087ed74a..67c70e32e3 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -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, diff --git a/slirp/main.h b/slirp/main.h index 9f22fe1b0a..8d09df9d4c 100644 --- a/slirp/main.h +++ b/slirp/main.h @@ -31,7 +31,6 @@ extern char *exec_shell; extern u_int curtime; extern fd_set *global_readfds, *global_writefds, *global_xfds; extern struct in_addr loopback_addr; -extern struct in_addr dns_addr; extern char *username; extern char *socket_path; extern int towrite_max; diff --git a/slirp/slirp.c b/slirp/slirp.c index da04ad19c8..b5335a54ac 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -27,8 +27,6 @@ #include "slirp.h" #include "hw/hw.h" -/* host dns address */ -struct in_addr dns_addr; /* host loopback address */ struct in_addr loopback_addr; @@ -49,9 +47,12 @@ static int do_slowtimo; static 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; @@ -59,6 +60,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) < 1000) { + *pdns_addr = dns_addr; + return 0; + } + FixedInfo = (FIXED_INFO *)GlobalAlloc(GPTR, sizeof(FIXED_INFO)); BufLen = sizeof(FIXED_INFO); @@ -82,6 +88,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; @@ -96,7 +104,9 @@ static void winsock_cleanup(void) #else -static int get_dns_addr(struct in_addr *pdns_addr) +struct stat dns_addr_stat; + +int get_dns_addr(struct in_addr *pdns_addr) { char buff[512]; char buff2[257]; @@ -104,6 +114,24 @@ static int get_dns_addr(struct in_addr *pdns_addr) int found = 0; struct in_addr tmp_addr; + if (dns_addr.s_addr != 0) { + struct stat old_stat; + if ((curtime - dns_addr_time) < 1000) { + *pdns_addr = dns_addr; + return 0; + } + old_stat = dns_addr_stat; + if (stat("/etc/resolv.conf", &dns_addr_stat) != 0) + return -1; + if ((dns_addr_stat.st_dev == old_stat.st_dev) + && (dns_addr_stat.st_ino == old_stat.st_ino) + && (dns_addr_stat.st_size == old_stat.st_size) + && (dns_addr_stat.st_mtime == old_stat.st_mtime)) { + *pdns_addr = dns_addr; + return 0; + } + } + f = fopen("/etc/resolv.conf", "r"); if (!f) return -1; @@ -116,8 +144,11 @@ static int get_dns_addr(struct in_addr *pdns_addr) if (!inet_aton(buff2, &tmp_addr)) continue; /* 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(", "); @@ -160,11 +191,6 @@ static void slirp_init_once(void) #endif loopback_addr.s_addr = htonl(INADDR_LOOPBACK); - - /* 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); diff --git a/slirp/socket.c b/slirp/socket.c index d8fbe89a74..207109c7ec 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -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; } diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 51b38344ef..04173450d7 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -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; } |