From 59736eb773c43dc39b9b6ba410a0b615a7c28993 Mon Sep 17 00:00:00 2001 From: acoul Date: Sun, 15 Aug 2010 09:53:21 +0000 Subject: package/busybox: update to busybox-1.7.1, include upstream patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22659 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/460-truncated_ping_results.patch | 46 ---------------------- 1 file changed, 46 deletions(-) delete mode 100644 package/busybox/patches/460-truncated_ping_results.patch (limited to 'package/busybox/patches/460-truncated_ping_results.patch') diff --git a/package/busybox/patches/460-truncated_ping_results.patch b/package/busybox/patches/460-truncated_ping_results.patch deleted file mode 100644 index 25f055549..000000000 --- a/package/busybox/patches/460-truncated_ping_results.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/networking/ping.c -+++ b/networking/ping.c -@@ -79,6 +79,7 @@ static int in_cksum(unsigned short *buf, - /* simple version */ - - static char *hostname; -+static unsigned datalen = DEFDATALEN; - - static void noresp(int ign UNUSED_PARAM) - { -@@ -91,7 +92,7 @@ static void ping4(len_and_sockaddr *lsa) - struct sockaddr_in pingaddr; - struct icmp *pkt; - int pingsock, c; -- char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; -+ char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN]; - - pingsock = create_icmp_socket(); - pingaddr = lsa->u.sin; -@@ -101,7 +102,7 @@ static void ping4(len_and_sockaddr *lsa) - pkt->icmp_type = ICMP_ECHO; - pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); - -- c = xsendto(pingsock, packet, DEFDATALEN + ICMP_MINLEN, -+ c = xsendto(pingsock, packet, datalen + ICMP_MINLEN, - (struct sockaddr *) &pingaddr, sizeof(pingaddr)); - - /* listen for replies */ -@@ -135,7 +136,7 @@ static void ping6(len_and_sockaddr *lsa) - struct icmp6_hdr *pkt; - int pingsock, c; - int sockopt; -- char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; -+ char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN]; - - pingsock = create_icmp6_socket(); - pingaddr = lsa->u.sin6; -@@ -147,7 +148,7 @@ static void ping6(len_and_sockaddr *lsa) - sockopt = offsetof(struct icmp6_hdr, icmp6_cksum); - setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt)); - -- c = xsendto(pingsock, packet, DEFDATALEN + sizeof (struct icmp6_hdr), -+ c = xsendto(pingsock, packet, datalen + sizeof (struct icmp6_hdr), - (struct sockaddr *) &pingaddr, sizeof(pingaddr)); - - /* listen for replies */ -- cgit v1.2.3