diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-05 00:27:49 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-05 00:27:49 +0000 |
commit | e8b81c92e78dc781a9569d7d51bd4f98d89237f8 (patch) | |
tree | 4d2e182e425873bcf891efcd1b3af569a158bedc /package/busybox/patches/450-truncated_ping_results.patch | |
parent | b9d7bab46bbb4d6943b8219bd31560281f1ab382 (diff) |
Upgrade busybox to 1.7.2
- clean up insmod crap
- add some lineno/programname fixes for awx
- clean up awk getopt stuff
- remove unnecessary patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9130 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/450-truncated_ping_results.patch')
-rw-r--r-- | package/busybox/patches/450-truncated_ping_results.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/package/busybox/patches/450-truncated_ping_results.patch b/package/busybox/patches/450-truncated_ping_results.patch deleted file mode 100644 index 34582c2ba..000000000 --- a/package/busybox/patches/450-truncated_ping_results.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: busybox-1.4.2/networking/ping.c -=================================================================== ---- busybox-1.4.2.orig/networking/ping.c 2007-06-04 13:21:31.931122400 +0200 -+++ busybox-1.4.2/networking/ping.c 2007-06-04 13:21:36.518425024 +0200 -@@ -70,7 +70,7 @@ - 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(); - -@@ -86,7 +86,7 @@ - pkt->icmp_type = ICMP_ECHO; - pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); - -- c = sendto(pingsock, packet, DEFDATALEN + ICMP_MINLEN, 0, -+ c = sendto(pingsock, packet, datalen + ICMP_MINLEN, 0, - (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in)); - - if (c < 0) { -@@ -274,6 +274,10 @@ - ++nreceived; - tp = (struct timeval *) icmppkt->icmp_data; - -+ /* If packet is too short, results will be truncated */ -+ if (sz < (ICMP_MINLEN + sizeof(tv.tv_sec) + sizeof(tv.tv_usec))) -+ return; -+ - if ((tv.tv_usec -= tp->tv_usec) < 0) { - --tv.tv_sec; - tv.tv_usec += 1000000; |