ping[6]: don't do htons(a++), it can be a macro

This commit is contained in:
Denis Vlasenko 2007-01-03 22:14:18 +00:00
parent b36b370fbe
commit 919c10dd88
2 changed files with 4 additions and 2 deletions

View File

@ -218,9 +218,10 @@ 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 = htons(ntransmitted++); pkt->icmp_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
pkt->icmp_id = myid; pkt->icmp_id = myid;
CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK); CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK);
ntransmitted++;
gettimeofday((struct timeval *) &pkt->icmp_dun, NULL); gettimeofday((struct timeval *) &pkt->icmp_dun, NULL);
pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));

View File

@ -206,9 +206,10 @@ static void sendping(int junk)
pkt->icmp6_type = ICMP6_ECHO_REQUEST; pkt->icmp6_type = ICMP6_ECHO_REQUEST;
pkt->icmp6_code = 0; pkt->icmp6_code = 0;
pkt->icmp6_cksum = 0; pkt->icmp6_cksum = 0;
pkt->icmp6_seq = htons(ntransmitted++); pkt->icmp6_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
pkt->icmp6_id = myid; pkt->icmp6_id = myid;
CLR(pkt->icmp6_seq % MAX_DUP_CHK); CLR(pkt->icmp6_seq % MAX_DUP_CHK);
ntransmitted++;
gettimeofday((struct timeval *) &pkt->icmp6_data8[4], NULL); gettimeofday((struct timeval *) &pkt->icmp6_data8[4], NULL);