KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

busybox: fix build of nslookup_lede applet without IPv6 (#728)

Browse source 
Protect any IPv6 related with appropriate guards to fix compilation with
disabled IPv6 support in Busybox.

Fixes #728.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2017-04-21 13:18:16 +02:00
parent e1d433b293
commit 8ed5c6d3b1
1 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
package/utils/busybox/patches/230-add_nslookup_lede.patch
View file

@ -1,4 +1,4 @@
From 8c1440a0934dd8b3ad6aae48d6653b5ba6fce8a1 Mon Sep 17 00:00:00 2001 From 2285cd400a10b1bde5472fe1cec3311300ee943c Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io> From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 14 Mar 2017 22:21:34 +0100 Date: Tue, 14 Mar 2017 22:21:34 +0100
Subject: [PATCH] networking: add LEDE nslookup applet Subject: [PATCH] networking: add LEDE nslookup applet
@ -12,16 +12,16 @@ and the libresolv primitives to parse received DNS responses.
Signed-off-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
--- ---
networking/nslookup_lede.c | 869 +++++++++++++++++++++++++++++++++++++++++++++ networking/nslookup_lede.c | 893 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 875 insertions(+) 1 file changed, 893 insertions(+)
create mode 100644 networking/nslookup_lede.c create mode 100644 networking/nslookup_lede.c
diff --git a/networking/nslookup_lede.c b/networking/nslookup_lede.c diff --git a/networking/nslookup_lede.c b/networking/nslookup_lede.c
new file mode 100644 new file mode 100644
index 0000000..fe927ad index 000000000..6f1f86502
--- /dev/null --- /dev/null
+++ b/networking/nslookup_lede.c +++ b/networking/nslookup_lede.c
@@ -0,0 +1,869 @@ @@ -0,0 +1,893 @@
+/* +/*
+ * nslookup_lede - musl compatible replacement for busybox nslookup + * nslookup_lede - musl compatible replacement for busybox nslookup
+ * + *
@ -109,7 +109,9 @@ index 0000000..fe927ad
+ { ns_t_soa, "SOA" }, + { ns_t_soa, "SOA" },
+ { ns_t_ns, "NS" }, + { ns_t_ns, "NS" },
+ { ns_t_a, "A" }, + { ns_t_a, "A" },
+#if ENABLE_FEATURE_IPV6
+ { ns_t_aaaa, "AAAA" }, + { ns_t_aaaa, "AAAA" },
+#endif
+ { ns_t_cname, "CNAME" }, + { ns_t_cname, "CNAME" },
+ { ns_t_mx, "MX" }, + { ns_t_mx, "MX" },
+ { ns_t_txt, "TXT" }, + { ns_t_txt, "TXT" },
@ -176,6 +178,7 @@ index 0000000..fe927ad
+ printf("Name:\t%s\nAddress: %s\n", ns_rr_name(rr), astr); + printf("Name:\t%s\nAddress: %s\n", ns_rr_name(rr), astr);
+ break; + break;
+ +
+#if ENABLE_FEATURE_IPV6
+ case ns_t_aaaa: + case ns_t_aaaa:
+ if (rdlen != 16) { + if (rdlen != 16) {
+ //fprintf(stderr, "Unexpected AAAA record length\n"); + //fprintf(stderr, "Unexpected AAAA record length\n");
@ -184,6 +187,7 @@ index 0000000..fe927ad
+ inet_ntop(AF_INET6, ns_rr_rdata(rr), astr, sizeof(astr)); + inet_ntop(AF_INET6, ns_rr_rdata(rr), astr, sizeof(astr));
+ printf("%s\thas AAAA address %s\n", ns_rr_name(rr), astr); + printf("%s\thas AAAA address %s\n", ns_rr_name(rr), astr);
+ break; + break;
+#endif
+ +
+ case ns_t_ns: + case ns_t_ns:
+ if (!format) + if (!format)
@ -326,6 +330,7 @@ index 0000000..fe927ad
+ } + }
+ } + }
+ +
+#if ENABLE_FEATURE_IPV6
+ if (inet_pton(AF_INET6, addrstr, &lsa->u.sin6.sin6_addr)) { + if (inet_pton(AF_INET6, addrstr, &lsa->u.sin6.sin6_addr)) {
+ lsa->u.sin6.sin6_family = AF_INET6; + lsa->u.sin6.sin6_family = AF_INET6;
+ lsa->u.sin6.sin6_port = htons(port); + lsa->u.sin6.sin6_port = htons(port);
@ -333,6 +338,7 @@ index 0000000..fe927ad
+ lsa->len = sizeof(lsa->u.sin6); + lsa->len = sizeof(lsa->u.sin6);
+ return 0; + return 0;
+ } + }
+#endif
+ +
+ if (!scope && inet_pton(AF_INET, addrstr, &lsa->u.sin.sin_addr)) { + if (!scope && inet_pton(AF_INET, addrstr, &lsa->u.sin.sin_addr)) {
+ lsa->u.sin.sin_family = AF_INET; + lsa->u.sin.sin_family = AF_INET;
@ -387,6 +393,7 @@ index 0000000..fe927ad
+ return (unsigned long)ts.tv_sec * 1000 + ts.tv_nsec / 1000000; + return (unsigned long)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+} +}
+ +
+#if ENABLE_FEATURE_IPV6
+static void to_v4_mapped(len_and_sockaddr *a) +static void to_v4_mapped(len_and_sockaddr *a)
+{ +{
+ if (a->u.sa.sa_family != AF_INET) + if (a->u.sa.sa_family != AF_INET)
@ -403,6 +410,7 @@ index 0000000..fe927ad
+ a->u.sin6.sin6_scope_id = 0; + a->u.sin6.sin6_scope_id = 0;
+ a->len = sizeof(a->u.sin6); + a->len = sizeof(a->u.sin6);
+} +}
+#endif
+ +
+ +
+/* +/*
@ -414,7 +422,9 @@ index 0000000..fe927ad
+ int fd; + int fd;
+ int timeout = default_timeout * 1000, retry_interval, servfail_retry = 0; + int timeout = default_timeout * 1000, retry_interval, servfail_retry = 0;
+ len_and_sockaddr from = { }; + len_and_sockaddr from = { };
+#if ENABLE_FEATURE_IPV6
+ int one = 1; + int one = 1;
+#endif
+ int recvlen = 0; + int recvlen = 0;
+ int n_replies = 0; + int n_replies = 0;
+ struct pollfd pfd; + struct pollfd pfd;
@ -424,6 +434,7 @@ index 0000000..fe927ad
+ from.u.sa.sa_family = AF_INET; + from.u.sa.sa_family = AF_INET;
+ from.len = sizeof(from.u.sin); + from.len = sizeof(from.u.sin);
+ +
+#if ENABLE_FEATURE_IPV6
+ for (nn = 0; nn < n_ns; nn++) { + for (nn = 0; nn < n_ns; nn++) {
+ if (ns[nn].addr.u.sa.sa_family == AF_INET6) { + if (ns[nn].addr.u.sa.sa_family == AF_INET6) {
+ from.u.sa.sa_family = AF_INET6; + from.u.sa.sa_family = AF_INET6;
@ -431,15 +442,18 @@ index 0000000..fe927ad
+ break; + break;
+ } + }
+ } + }
+#endif
+ +
+ /* Get local address and open/bind a socket */ + /* Get local address and open/bind a socket */
+ fd = socket(from.u.sa.sa_family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); + fd = socket(from.u.sa.sa_family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+ +
+#if ENABLE_FEATURE_IPV6
+ /* Handle case where system lacks IPv6 support */ + /* Handle case where system lacks IPv6 support */
+ if (fd < 0 && from.u.sa.sa_family == AF_INET6 && errno == EAFNOSUPPORT) { + if (fd < 0 && from.u.sa.sa_family == AF_INET6 && errno == EAFNOSUPPORT) {
+ fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); + fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+ from.u.sa.sa_family = AF_INET; + from.u.sa.sa_family = AF_INET;
+ } + }
+#endif
+ +
+ if (fd < 0) + if (fd < 0)
+ return -1; + return -1;
@ -449,6 +463,7 @@ index 0000000..fe927ad
+ return -1; + return -1;
+ } + }
+ +
+#if ENABLE_FEATURE_IPV6
+ /* Convert any IPv4 addresses in a mixed environment to v4-mapped */ + /* Convert any IPv4 addresses in a mixed environment to v4-mapped */
+ if (from.u.sa.sa_family == AF_INET6) { + if (from.u.sa.sa_family == AF_INET6) {
+ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)); + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));
@ -456,6 +471,7 @@ index 0000000..fe927ad
+ for (nn = 0; nn < n_ns; nn++) + for (nn = 0; nn < n_ns; nn++)
+ to_v4_mapped(&ns[nn].addr); + to_v4_mapped(&ns[nn].addr);
+ } + }
+#endif
+ +
+ pfd.fd = fd; + pfd.fd = fd;
+ pfd.events = POLLIN; + pfd.events = POLLIN;
@ -587,6 +603,11 @@ index 0000000..fe927ad
+ aip->ai_addr->sa_family != AF_INET6) + aip->ai_addr->sa_family != AF_INET6)
+ continue; + continue;
+ +
+#if ! ENABLE_FEATURE_IPV6
+ if (aip->ai_addr->sa_family != AF_INET)
+ continue;
+#endif
+
+ tmp = realloc(*ns, sizeof(**ns) * (*n_ns + 1)); + tmp = realloc(*ns, sizeof(**ns) * (*n_ns + 1));
+ +
+ if (!tmp) + if (!tmp)
@ -685,6 +706,7 @@ index 0000000..fe927ad
+ static char buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ + 1 + 5 + 1]; + static char buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ + 1 + 5 + 1];
+ char *p = buf; + char *p = buf;
+ +
+#if ENABLE_FEATURE_IPV6
+ if (a->u.sa.sa_family == AF_INET6) { + if (a->u.sa.sa_family == AF_INET6) {
+ inet_ntop(AF_INET6, &a->u.sin6.sin6_addr, buf, sizeof(buf)); + inet_ntop(AF_INET6, &a->u.sin6.sin6_addr, buf, sizeof(buf));
+ p += strlen(p); + p += strlen(p);
@ -696,12 +718,14 @@ index 0000000..fe927ad
+ } + }
+ } + }
+ } + }
+ else { + else
+#endif
+ {
+ inet_ntop(AF_INET, &a->u.sin.sin_addr, buf, sizeof(buf)); + inet_ntop(AF_INET, &a->u.sin.sin_addr, buf, sizeof(buf));
+ p += strlen(p); + p += strlen(p);
+ } + }
+ +
+ sprintf(p, "#%hu", ntohs(a->u.sin6.sin6_port)); + sprintf(p, "#%hu", ntohs(a->u.sin.sin_port));
+ +
+ return buf; + return buf;
+} +}
@ -892,5 +916,5 @@ index 0000000..fe927ad
+ return rc; + return rc;
+} +}
-- --
2.1.4 2.11.0