patches/connman/libresolv.patch

   1 musl does not implement res_ninit
   2
   3 --- a/gweb/gresolv.c
   4 +++ b/gweb/gresolv.c
   5 @@ -877,8 +877,6 @@
   6         resolv->index = index;
   7         resolv->nameserver_list = NULL;
   8
   9 -       res_ninit(&resolv->res);
  10 -
  11         return resolv;
  12  }
  13
  14 @@ -918,8 +916,6 @@
  15
  16         flush_nameservers(resolv);
  17
  18 -       res_nclose(&resolv->res);
  19 -
  20         g_free(resolv);
  21  }
  22
  23 @@ -1022,24 +1018,19 @@
  24         debug(resolv, "hostname %s", hostname);
  25
  26         if (!resolv->nameserver_list) {
  27 -               int i;
  28 -
  29 -               for (i = 0; i < resolv->res.nscount; i++) {
  30 -                       char buf[100];
  31 -                       int family = resolv->res.nsaddr_list[i].sin_family;
  32 -                       void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr;
  33 -
  34 -                       if (family != AF_INET &&
  35 -                                       resolv->res._u._ext.nsaddrs[i]) {
  36 -                               family = AF_INET6;
  37 -                               sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr;
  38 +               FILE *f = fopen("/etc/resolv.conf", "r");
  39 +               if (f) {
  40 +                       char line[256], *s;
  41 +                       int i;
  42 +                       while (fgets(line, sizeof(line), f)) {
  43 +                               if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
  44 +                                       continue;
  45 +                               for (s = &line[11]; isspace(s[0]); s++);
  46 +                               for (i = 0; s[i] && !isspace(s[i]); i++);
  47 +                               s[i] = 0;
  48 +                               g_resolv_add_nameserver(resolv, s, 53, 0);
  49                         }
  50 -
  51 -                       if (family != AF_INET && family != AF_INET6)
  52 -                               continue;
  53 -
  54 -                       if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
  55 -                               g_resolv_add_nameserver(resolv, buf, 53, 0);
  56 +                       fclose(f);
  57                 }
  58
  59                 if (!resolv->nameserver_list)