svn commit: trunk/busybox/networking

pgf at busybox.net pgf at busybox.net
Fri Feb 1 23:25:35 UTC 2008


Author: pgf
Date: 2008-02-01 15:25:32 -0800 (Fri, 01 Feb 2008)
New Revision: 20928

Log:
Fix compilation error when FEATURE_FANCY_PING enabled.  Also
reorder networking/Config.in moving FEATURE_FANCY_PING next to
PING6.  (Cristian Ionescu-Idbohrn)



Modified:
   trunk/busybox/networking/Config.in
   trunk/busybox/networking/ping.c


Changeset:
Modified: trunk/busybox/networking/Config.in
===================================================================
--- trunk/busybox/networking/Config.in	2008-02-01 06:53:50 UTC (rev 20927)
+++ trunk/busybox/networking/Config.in	2008-02-01 23:25:32 UTC (rev 20928)
@@ -645,12 +645,6 @@
 	help
 	  This will give you a ping that can talk IPv6.
 
-config PSCAN
-	bool "pscan"
-	default n
-	help
-	  Simple network port scanner.
-
 config FEATURE_FANCY_PING
 	bool "Enable fancy ping output"
 	default y
@@ -659,6 +653,12 @@
 	  Make the output from the ping applet include statistics, and at the
 	  same time provide full support for ICMP packets.
 
+config PSCAN
+	bool "pscan"
+	default n
+	help
+	  Simple network port scanner.
+
 config ROUTE
 	bool "route"
 	default n

Modified: trunk/busybox/networking/ping.c
===================================================================
--- trunk/busybox/networking/ping.c	2008-02-01 06:53:50 UTC (rev 20927)
+++ trunk/busybox/networking/ping.c	2008-02-01 23:25:32 UTC (rev 20928)
@@ -94,7 +94,7 @@
 	char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
 	pingsock = create_icmp_socket();
-	pingaddr = lsa->sin;
+	pingaddr = lsa->u.sin;
 
 	pkt = (struct icmp *) packet;
 	memset(pkt, 0, sizeof(packet));
@@ -138,7 +138,7 @@
 	char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
 	pingsock = create_icmp6_socket();
-	pingaddr = lsa->sin6;
+	pingaddr = lsa->u.sin6;
 
 	pkt = (struct icmp6_hdr *) packet;
 	memset(pkt, 0, sizeof(packet));




More information about the busybox-cvs mailing list