aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-02-28 12:58:02 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-02-28 12:58:02 +0000
commit4c71989564cb66bffc1cd9f075f0c776282b61e4 (patch)
treea9e39f5acb1c7b3f3334f8b0cc3063fd6b743cf1 /package/busybox
parent4a8472619fb735671d8ebbfd506031c1442226b5 (diff)
downloadupstream-4c71989564cb66bffc1cd9f075f0c776282b61e4.tar.gz
upstream-4c71989564cb66bffc1cd9f075f0c776282b61e4.tar.bz2
upstream-4c71989564cb66bffc1cd9f075f0c776282b61e4.zip
[package] fix busybox's ping compilation when the fancy feature is turned off (#6489)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19904 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/patches/460-truncated_ping_results.patch22
1 files changed, 16 insertions, 6 deletions
diff --git a/package/busybox/patches/460-truncated_ping_results.patch b/package/busybox/patches/460-truncated_ping_results.patch
index 70f55d2e89..f45caac009 100644
--- a/package/busybox/patches/460-truncated_ping_results.patch
+++ b/package/busybox/patches/460-truncated_ping_results.patch
@@ -1,6 +1,16 @@
---- a/networking/ping.c
-+++ b/networking/ping.c
-@@ -91,7 +91,7 @@ static void ping4(len_and_sockaddr *lsa)
+Index: busybox-1.15.3/networking/ping.c
+===================================================================
+--- busybox-1.15.3.orig/networking/ping.c 2010-02-28 13:47:00.000000000 +0100
++++ busybox-1.15.3/networking/ping.c 2010-02-28 13:47:19.000000000 +0100
+@@ -79,6 +79,7 @@
+ /* simple version */
+
+ static char *hostname;
++static unsigned datalen = DEFDATALEN;
+
+ static void noresp(int ign UNUSED_PARAM)
+ {
+@@ -91,7 +92,7 @@
struct sockaddr_in pingaddr;
struct icmp *pkt;
int pingsock, c;
@@ -9,7 +19,7 @@
pingsock = create_icmp_socket();
pingaddr = lsa->u.sin;
-@@ -101,7 +101,7 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -101,7 +102,7 @@
pkt->icmp_type = ICMP_ECHO;
pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
@@ -18,7 +28,7 @@
(struct sockaddr *) &pingaddr, sizeof(pingaddr));
/* listen for replies */
-@@ -135,7 +135,7 @@ static void ping6(len_and_sockaddr *lsa)
+@@ -135,7 +136,7 @@
struct icmp6_hdr *pkt;
int pingsock, c;
int sockopt;
@@ -27,7 +37,7 @@
pingsock = create_icmp6_socket();
pingaddr = lsa->u.sin6;
-@@ -147,7 +147,7 @@ static void ping6(len_and_sockaddr *lsa)
+@@ -147,7 +148,7 @@
sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));