Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 6 Apr 2015 23:02:21 -0700 |
| 4 | Subject: [PATCH 2/3] resolve: musl does not implement res_ninit |
| 5 | |
| 6 | ported from |
| 7 | http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | gweb/gresolv.c | 33 ++++++++++++--------------------- |
| 14 | 1 file changed, 12 insertions(+), 21 deletions(-) |
| 15 | |
| 16 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c |
| 17 | index 5cf7a9a..3ad8e70 100644 |
| 18 | --- a/gweb/gresolv.c |
| 19 | +++ b/gweb/gresolv.c |
| 20 | @@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index) |
| 21 | resolv->index = index; |
| 22 | resolv->nameserver_list = NULL; |
| 23 | |
| 24 | - res_ninit(&resolv->res); |
| 25 | - |
| 26 | return resolv; |
| 27 | } |
| 28 | |
| 29 | @@ -916,8 +914,6 @@ void g_resolv_unref(GResolv *resolv) |
| 30 | |
| 31 | flush_nameservers(resolv); |
| 32 | |
| 33 | - res_nclose(&resolv->res); |
| 34 | - |
| 35 | g_free(resolv); |
| 36 | } |
| 37 | |
| 38 | @@ -1020,24 +1016,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, |
| 39 | debug(resolv, "hostname %s", hostname); |
| 40 | |
| 41 | if (!resolv->nameserver_list) { |
| 42 | - int i; |
| 43 | - |
| 44 | - for (i = 0; i < resolv->res.nscount; i++) { |
| 45 | - char buf[100]; |
| 46 | - int family = resolv->res.nsaddr_list[i].sin_family; |
| 47 | - void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr; |
| 48 | - |
| 49 | - if (family != AF_INET && |
| 50 | - resolv->res._u._ext.nsaddrs[i]) { |
| 51 | - family = AF_INET6; |
| 52 | - sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr; |
| 53 | + FILE *f = fopen("/etc/resolv.conf", "r"); |
| 54 | + if (f) { |
| 55 | + char line[256], *s; |
| 56 | + int i; |
| 57 | + while (fgets(line, sizeof(line), f)) { |
| 58 | + if (strncmp(line, "nameserver", 10) || !isspace(line[10])) |
| 59 | + continue; |
| 60 | + for (s = &line[11]; isspace(s[0]); s++); |
| 61 | + for (i = 0; s[i] && !isspace(s[i]); i++); |
| 62 | + s[i] = 0; |
| 63 | + g_resolv_add_nameserver(resolv, s, 53, 0); |
| 64 | } |
| 65 | - |
| 66 | - if (family != AF_INET && family != AF_INET6) |
| 67 | - continue; |
| 68 | - |
| 69 | - if (inet_ntop(family, sa_addr, buf, sizeof(buf))) |
| 70 | - g_resolv_add_nameserver(resolv, buf, 53, 0); |
| 71 | + fclose(f); |
| 72 | } |
| 73 | |
| 74 | if (!resolv->nameserver_list) |
| 75 | -- |
| 76 | 2.5.1 |
| 77 | |