diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-10-20 13:23:47 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-10-20 14:35:20 +0300 |
commit | 5cf28509ada303e8995113af9390d10553c60bef (patch) | |
tree | 6ef3c94ee4bf7350f8a3d26331ae4d0c260ccf11 /src/builtin/dns.bi | |
parent | 04a44fafaa2baf0be206a457febca5540b7e3f4a (diff) | |
download | mailfromd-5cf28509ada303e8995113af9390d10553c60bef.tar.gz mailfromd-5cf28509ada303e8995113af9390d10553c60bef.tar.bz2 |
Rewrite base dns functions using adns.
* configure.ac: Require libadns.
* lib/dns.c: Rewrite.
* lib/dns.h (dns_resolve_ipstr, dns_resolve_hostname): Simplify
parameters.
(dns_reply): Remove max, last_len, and last_max.
Diffstat (limited to 'src/builtin/dns.bi')
-rw-r--r-- | src/builtin/dns.bi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/builtin/dns.bi b/src/builtin/dns.bi index 137cccc8..c23aaf31 100644 --- a/src/builtin/dns.bi +++ b/src/builtin/dns.bi @@ -61,8 +61,8 @@ END static int ipaddr_cmp(const void *a, const void *b) { - GACOPYZ_UINT32_T ipa = ntohl(**(GACOPYZ_UINT32_T**)a); - GACOPYZ_UINT32_T ipb = ntohl(**(GACOPYZ_UINT32_T**)b); + GACOPYZ_UINT32_T ipa = ntohl(*(GACOPYZ_UINT32_T*)a); + GACOPYZ_UINT32_T ipb = ntohl(*(GACOPYZ_UINT32_T*)b); if (ipa < ipb) return -1; if (ipa > ipb) @@ -80,12 +80,12 @@ MF_DEFUN(dns_getaddr, STRING, STRING string) switch (dnstat) { case dns_success: { MF_OBSTACK_BEGIN(); - qsort(r.base, r.count, sizeof r.base[0], ipaddr_cmp); + qsort(r.data.ip, r.count, sizeof r.data.ip[0], ipaddr_cmp); for (i = 0; i < r.count; i++) { struct in_addr addr; char *q; - addr.s_addr = dns_reply_ip(&r, i); + addr.s_addr = r.data.ip[i]; q = inet_ntoa(addr); if (i > 0) MF_OBSTACK_1GROW(' '); @@ -125,13 +125,13 @@ MF_DEFUN(dns_getname, STRING, STRING ipstr) case dns_success: { size_t i; - qsort(r.base, r.count, sizeof r.base[0], hostname_cmp); + qsort(r.data.str, r.count, sizeof r.data.str[0], hostname_cmp); MF_OBSTACK_BEGIN(); for (i = 0; i < r.count; i++) { if (i > 0) MF_OBSTACK_1GROW(' '); - MF_OBSTACK_GROW((char*)r.base[i]); + MF_OBSTACK_GROW((char*)r.data.str[i]); } MF_OBSTACK_1GROW(0); |