[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] slirp: Split get_dns_addr
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 2/5] slirp: Split get_dns_addr |
Date: |
Thu, 31 Mar 2016 11:20:17 +0200 |
Separate get_dns_addr into get_dns_addr_cached and get_dns_addr_resolv_conf
to make conversion to IPv6 easier.
Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
slirp/slirp.c | 53 ++++++++++++++++++++++++++++++++++-------------------
1 file changed, 34 insertions(+), 19 deletions(-)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index cefb9dc..4478a43 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -109,7 +109,28 @@ static void winsock_cleanup(void)
static struct stat dns_addr_stat;
-int get_dns_addr(struct in_addr *pdns_addr)
+static int get_dns_addr_cached(struct in_addr *pdns_addr)
+{
+ struct stat old_stat;
+ if (curtime - dns_addr_time < TIMEOUT_DEFAULT) {
+ *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;
+ }
+ return 1;
+}
+
+static int get_dns_addr_resolv_conf(struct in_addr *pdns_addr)
{
char buff[512];
char buff2[257];
@@ -117,24 +138,6 @@ 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) < TIMEOUT_DEFAULT) {
- *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;
@@ -174,6 +177,18 @@ int get_dns_addr(struct in_addr *pdns_addr)
return 0;
}
+int get_dns_addr(struct in_addr *pdns_addr)
+{
+ if (dns_addr.s_addr != 0) {
+ int ret;
+ ret = get_dns_addr_cached(pdns_addr);
+ if (ret <= 0) {
+ return ret;
+ }
+ }
+ return get_dns_addr_resolv_conf(pdns_addr);
+}
+
#endif
static void slirp_init_once(void)
--
2.8.0.rc3
- [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Samuel Thibault, 2016/03/31
- [Qemu-devel] [PULL 5/5] slirp: Add RDNSS advertisement, Samuel Thibault, 2016/03/31
- [Qemu-devel] [PULL 3/5] slirp: Add dns6 resolution, Samuel Thibault, 2016/03/31
- [Qemu-devel] [PULL 1/5] slirp: Allow disabling IPv4 or IPv6, Samuel Thibault, 2016/03/31
- [Qemu-devel] [PULL 4/5] slirp: Support link-local DNS addresses, Samuel Thibault, 2016/03/31
- [Qemu-devel] [PULL 2/5] slirp: Split get_dns_addr,
Samuel Thibault <=
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Peter Maydell, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Samuel Thibault, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Vasiliy Tolstov, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Samuel Thibault, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Vasiliy Tolstov, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Vasiliy Tolstov, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Samuel Thibault, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Vasiliy Tolstov, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Samuel Thibault, 2016/03/31
- Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support, Vasiliy Tolstov, 2016/03/31