move __res_msend_rc declaration to lookup.h

[musl] / src / network / lookup_name.c

diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c
index a1851f1..5a096ac 100644 (file)
--- a/src/network/lookup_name.c
+++ b/src/network/lookup_name.c
@@ -98,10 +98,8 @@ struct dpc_ctx {
        int cnt;
 };
 
-int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
 int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
 int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
-int __res_msend_rc(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int, const struct resolvconf *);
 
 #define RR_A 1
 #define RR_CNAME 5
@@ -355,36 +353,53 @@ int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], c
         * excessive runtime and code size cost and dubious benefit.
         * So far the label/precedence table cannot be customized. */
        for (i=0; i<cnt; i++) {
+               int family = buf[i].family;
                int key = 0;
-               struct sockaddr_in6 sa, da = {
+               struct sockaddr_in6 sa6 = { 0 }, da6 = {
                        .sin6_family = AF_INET6,
                        .sin6_scope_id = buf[i].scopeid,
                        .sin6_port = 65535
                };
-               if (buf[i].family == AF_INET6) {
-                       memcpy(da.sin6_addr.s6_addr, buf[i].addr, 16);
+               struct sockaddr_in sa4 = { 0 }, da4 = {
+                       .sin_family = AF_INET,
+                       .sin_port = 65535
+               };
+               void *sa, *da;
+               socklen_t salen, dalen;
+               if (family == AF_INET6) {
+                       memcpy(da6.sin6_addr.s6_addr, buf[i].addr, 16);
+                       da = &da6; dalen = sizeof da6;
+                       sa = &sa6; salen = sizeof sa6;
                } else {
-                       memcpy(da.sin6_addr.s6_addr,
+                       memcpy(sa6.sin6_addr.s6_addr,
+                               "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+                       memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4);
+                       memcpy(da6.sin6_addr.s6_addr,
                                "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
-                       memcpy(da.sin6_addr.s6_addr+12, buf[i].addr, 4);
+                       memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4);
+                       memcpy(&da4.sin_addr, buf[i].addr, 4);
+                       da = &da4; dalen = sizeof da4;
+                       sa = &sa4; salen = sizeof sa4;
                }
-               const struct policy *dpolicy = policyof(&da.sin6_addr);
-               int dscope = scopeof(&da.sin6_addr);
+               const struct policy *dpolicy = policyof(&da6.sin6_addr);
+               int dscope = scopeof(&da6.sin6_addr);
                int dlabel = dpolicy->label;
                int dprec = dpolicy->prec;
                int prefixlen = 0;
-               int fd = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP);
+               int fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP);
                if (fd >= 0) {
-                       if (!connect(fd, (void *)&da, sizeof da)) {
+                       if (!connect(fd, da, dalen)) {
                                key |= DAS_USABLE;
-                               if (!getsockname(fd, (void *)&sa,
-                                   &(socklen_t){sizeof sa})) {
-                                       if (dscope == scopeof(&sa.sin6_addr))
+                               if (!getsockname(fd, sa, &salen)) {
+                                       if (family == AF_INET) memcpy(
+                                               sa6.sin6_addr.s6_addr+12,
+                                               &sa4.sin_addr, 4);
+                                       if (dscope == scopeof(&sa6.sin6_addr))
                                                key |= DAS_MATCHINGSCOPE;
-                                       if (dlabel == labelof(&sa.sin6_addr))
+                                       if (dlabel == labelof(&sa6.sin6_addr))
                                                key |= DAS_MATCHINGLABEL;
-                                       prefixlen = prefixmatch(&sa.sin6_addr,
-                                               &da.sin6_addr);
+                                       prefixlen = prefixmatch(&sa6.sin6_addr,
+                                               &da6.sin6_addr);
                                }
                        }
                        close(fd);