emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ping(6): use htons instead of SWAP_BE.

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-02 16:57:59 +00:00
parent 2cbe6e6eb2
commit e0b7f71d26
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/ping.c
View File

@ -209,7 +209,7 @@ 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 = SWAP_BE16(ntransmitted++); pkt->icmp_seq = htons(ntransmitted++);
pkt->icmp_id = myid; pkt->icmp_id = myid;
CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK); CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK);
@ -235,7 +235,7 @@ static void sendping(int junk)
} }
} }
static char *icmp_type_name (int id) static char *icmp_type_name(int id)
{ {
switch (id) { switch (id) {
case ICMP_ECHOREPLY: return "Echo Reply"; case ICMP_ECHOREPLY: return "Echo Reply";
@ -318,7 +318,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
} else } else
if (icmppkt->icmp_type != ICMP_ECHO) if (icmppkt->icmp_type != ICMP_ECHO)
bb_error_msg("Warning: Got ICMP %d (%s)", bb_error_msg("Warning: Got ICMP %d (%s)",
icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type)); icmppkt->icmp_type, icmp_type_name(icmppkt->icmp_type));
fflush(stdout); fflush(stdout);
} }

6
networking/ping6.c
View File

@ -198,7 +198,7 @@ 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 = SWAP_BE16(ntransmitted++); pkt->icmp6_seq = htons(ntransmitted++);
pkt->icmp6_id = myid; pkt->icmp6_id = myid;
CLR(pkt->icmp6_seq % MAX_DUP_CHK); CLR(pkt->icmp6_seq % MAX_DUP_CHK);
@ -234,7 +234,7 @@ static void sendping(int junk)
#ifndef MLD_LISTENER_REDUCTION #ifndef MLD_LISTENER_REDUCTION
# define MLD_LISTENER_REDUCTION ICMP6_MEMBERSHIP_REDUCTION # define MLD_LISTENER_REDUCTION ICMP6_MEMBERSHIP_REDUCTION
#endif #endif
static char *icmp6_type_name (int id) static char *icmp6_type_name(int id)
{ {
switch (id) { switch (id) {
case ICMP6_DST_UNREACH: return "Destination Unreachable"; case ICMP6_DST_UNREACH: return "Destination Unreachable";
@ -309,7 +309,7 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit
} else } else
if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST)
bb_error_msg("Warning: Got ICMP %d (%s)", bb_error_msg("Warning: Got ICMP %d (%s)",
icmppkt->icmp6_type, icmp6_type_name (icmppkt->icmp6_type)); icmppkt->icmp6_type, icmp6_type_name(icmppkt->icmp6_type));
} }
static void ping(const char *host) static void ping(const char *host)