1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-09 21:41:53 +02:00
openwrt-xburst/package/busybox/patches/460-truncated_ping_results.patch
florian 6f36c97668 [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
2010-02-28 12:58:02 +00:00

49 lines
1.6 KiB
Diff

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;
- char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
+ char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN];
pingsock = create_icmp_socket();
pingaddr = lsa->u.sin;
@@ -101,7 +102,7 @@
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 @@
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 @@
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 */