svn commit: trunk/busybox/networking

vda at busybox.net vda at busybox.net
Sat Sep 2 16:58:00 UTC 2006


Author: vda
Date: 2006-09-02 09:57:59 -0700 (Sat, 02 Sep 2006)
New Revision: 16030

Log:
ping(6): use htons instead of SWAP_BE.



Modified:
   trunk/busybox/networking/ping.c
   trunk/busybox/networking/ping6.c


Changeset:
Modified: trunk/busybox/networking/ping.c
===================================================================
--- trunk/busybox/networking/ping.c	2006-09-02 16:17:30 UTC (rev 16029)
+++ trunk/busybox/networking/ping.c	2006-09-02 16:57:59 UTC (rev 16030)
@@ -209,7 +209,7 @@
 	pkt->icmp_type = ICMP_ECHO;
 	pkt->icmp_code = 0;
 	pkt->icmp_cksum = 0;
-	pkt->icmp_seq = SWAP_BE16(ntransmitted++);
+	pkt->icmp_seq = htons(ntransmitted++);
 	pkt->icmp_id = myid;
 	CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK);
 
@@ -235,7 +235,7 @@
 	}
 }
 
-static char *icmp_type_name (int id)
+static char *icmp_type_name(int id)
 {
 	switch (id) {
 	case ICMP_ECHOREPLY:		return "Echo Reply";
@@ -318,7 +318,7 @@
 	} else
 		if (icmppkt->icmp_type != ICMP_ECHO)
 			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);
 }
 

Modified: trunk/busybox/networking/ping6.c
===================================================================
--- trunk/busybox/networking/ping6.c	2006-09-02 16:17:30 UTC (rev 16029)
+++ trunk/busybox/networking/ping6.c	2006-09-02 16:57:59 UTC (rev 16030)
@@ -198,7 +198,7 @@
 	pkt->icmp6_type = ICMP6_ECHO_REQUEST;
 	pkt->icmp6_code = 0;
 	pkt->icmp6_cksum = 0;
-	pkt->icmp6_seq = SWAP_BE16(ntransmitted++);
+	pkt->icmp6_seq = htons(ntransmitted++);
 	pkt->icmp6_id = myid;
 	CLR(pkt->icmp6_seq % MAX_DUP_CHK);
 
@@ -234,7 +234,7 @@
 #ifndef MLD_LISTENER_REDUCTION
 # define MLD_LISTENER_REDUCTION ICMP6_MEMBERSHIP_REDUCTION
 #endif
-static char *icmp6_type_name (int id)
+static char *icmp6_type_name(int id)
 {
 	switch (id) {
 	case ICMP6_DST_UNREACH:				return "Destination Unreachable";
@@ -309,7 +309,7 @@
 	} else
 		if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST)
 			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)




More information about the busybox-cvs mailing list