diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-01-03 22:14:18 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-01-03 22:14:18 +0000 |
commit | 51fb1f6ee23b72342894319d282903f5a6adf26c (patch) | |
tree | 54d17a4ecceace5a12e0823204a46a9396db756d | |
parent | c674c5a0447ea2e081983c01283bdf82b06cb1cf (diff) | |
download | busybox-w32-51fb1f6ee23b72342894319d282903f5a6adf26c.tar.gz busybox-w32-51fb1f6ee23b72342894319d282903f5a6adf26c.tar.bz2 busybox-w32-51fb1f6ee23b72342894319d282903f5a6adf26c.zip |
ping[6]: don't do htons(a++), it can be a macro
git-svn-id: svn://busybox.net/trunk/busybox@17148 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | networking/ping.c | 3 | ||||
-rw-r--r-- | networking/ping6.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/networking/ping.c b/networking/ping.c index acbb8ec6f..8b49df1bd 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -218,9 +218,10 @@ static void sendping(int junk) | |||
218 | pkt->icmp_type = ICMP_ECHO; | 218 | pkt->icmp_type = ICMP_ECHO; |
219 | pkt->icmp_code = 0; | 219 | pkt->icmp_code = 0; |
220 | pkt->icmp_cksum = 0; | 220 | pkt->icmp_cksum = 0; |
221 | pkt->icmp_seq = htons(ntransmitted++); | 221 | pkt->icmp_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */ |
222 | pkt->icmp_id = myid; | 222 | pkt->icmp_id = myid; |
223 | CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK); | 223 | CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK); |
224 | ntransmitted++; | ||
224 | 225 | ||
225 | gettimeofday((struct timeval *) &pkt->icmp_dun, NULL); | 226 | gettimeofday((struct timeval *) &pkt->icmp_dun, NULL); |
226 | pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); | 227 | pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); |
diff --git a/networking/ping6.c b/networking/ping6.c index 778dcd4f5..c0b31c752 100644 --- a/networking/ping6.c +++ b/networking/ping6.c | |||
@@ -206,9 +206,10 @@ static void sendping(int junk) | |||
206 | pkt->icmp6_type = ICMP6_ECHO_REQUEST; | 206 | pkt->icmp6_type = ICMP6_ECHO_REQUEST; |
207 | pkt->icmp6_code = 0; | 207 | pkt->icmp6_code = 0; |
208 | pkt->icmp6_cksum = 0; | 208 | pkt->icmp6_cksum = 0; |
209 | pkt->icmp6_seq = htons(ntransmitted++); | 209 | pkt->icmp6_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */ |
210 | pkt->icmp6_id = myid; | 210 | pkt->icmp6_id = myid; |
211 | CLR(pkt->icmp6_seq % MAX_DUP_CHK); | 211 | CLR(pkt->icmp6_seq % MAX_DUP_CHK); |
212 | ntransmitted++; | ||
212 | 213 | ||
213 | gettimeofday((struct timeval *) &pkt->icmp6_data8[4], NULL); | 214 | gettimeofday((struct timeval *) &pkt->icmp6_data8[4], NULL); |
214 | 215 | ||