BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BsAtHome writes in Bug 433: 

Ping packets sent by busybox have wrong endian on f.x. mips32 (openwrt). Attatched is a patch that 
uses htons() and ntohs() to be platform independent.
1_1_stable
Mike Frysinger 2005-09-15 01:32:48 +00:00
parent 23f62fc6f3
commit 887a1ad57f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
networking/ping.c
View File

@ -226,9 +226,9 @@ static void sendping(int junk)
pkt->icmp_type = ICMP_ECHO; pkt->icmp_type = ICMP_ECHO;
pkt->icmp_code = 0; pkt->icmp_code = 0;
pkt->icmp_cksum = 0; pkt->icmp_cksum = 0;
pkt->icmp_seq = ntransmitted++; pkt->icmp_seq = htons(ntransmitted++);
pkt->icmp_id = myid; pkt->icmp_id = myid;
CLR(pkt->icmp_seq % MAX_DUP_CHK); CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK);
gettimeofday((struct timeval *) &packet[8], NULL); gettimeofday((struct timeval *) &packet[8], NULL);
pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
@ -296,6 +296,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
return; /* not our ping */ return; /* not our ping */
if (icmppkt->icmp_type == ICMP_ECHOREPLY) { if (icmppkt->icmp_type == ICMP_ECHOREPLY) {
u_int16_t recv_seq = ntohs(icmppkt->icmp_seq);
++nreceived; ++nreceived;
tp = (struct timeval *) icmppkt->icmp_data; tp = (struct timeval *) icmppkt->icmp_data;
@ -312,12 +313,12 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
if (triptime > tmax) if (triptime > tmax)
tmax = triptime; tmax = triptime;
if (TST(icmppkt->icmp_seq % MAX_DUP_CHK)) { if (TST(recv_seq % MAX_DUP_CHK)) {
++nrepeats; ++nrepeats;
--nreceived; --nreceived;
dupflag = 1; dupflag = 1;
} else { } else {
SET(icmppkt->icmp_seq % MAX_DUP_CHK); SET(recv_seq % MAX_DUP_CHK);
dupflag = 0; dupflag = 0;
} }
@ -326,7 +327,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
printf("%d bytes from %s: icmp_seq=%u", sz, printf("%d bytes from %s: icmp_seq=%u", sz,
inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr), inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
icmppkt->icmp_seq); recv_seq);
printf(" ttl=%d", iphdr->ttl); printf(" ttl=%d", iphdr->ttl);
printf(" time=%lu.%lu ms", triptime / 10, triptime % 10); printf(" time=%lu.%lu ms", triptime / 10, triptime % 10);
if (dupflag) if (dupflag)