Fix compilation error when FEATURE_FANCY_PING enabled. Also

reorder networking/Config.in moving FEATURE_FANCY_PING next to
PING6.  (Cristian Ionescu-Idbohrn)
This commit is contained in:
Paul Fox 2008-02-01 23:25:32 +00:00
parent f0044c480c
commit 0b2b5842a1
2 changed files with 8 additions and 8 deletions

View File

@ -645,12 +645,6 @@ config PING6
help help
This will give you a ping that can talk IPv6. 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 config FEATURE_FANCY_PING
bool "Enable fancy ping output" bool "Enable fancy ping output"
default y default y
@ -659,6 +653,12 @@ config FEATURE_FANCY_PING
Make the output from the ping applet include statistics, and at the Make the output from the ping applet include statistics, and at the
same time provide full support for ICMP packets. same time provide full support for ICMP packets.
config PSCAN
bool "pscan"
default n
help
Simple network port scanner.
config ROUTE config ROUTE
bool "route" bool "route"
default n default n

View File

@ -94,7 +94,7 @@ static void ping4(len_and_sockaddr *lsa)
char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
pingsock = create_icmp_socket(); pingsock = create_icmp_socket();
pingaddr = lsa->sin; pingaddr = lsa->u.sin;
pkt = (struct icmp *) packet; pkt = (struct icmp *) packet;
memset(pkt, 0, sizeof(packet)); memset(pkt, 0, sizeof(packet));
@ -138,7 +138,7 @@ static void ping6(len_and_sockaddr *lsa)
char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
pingsock = create_icmp6_socket(); pingsock = create_icmp6_socket();
pingaddr = lsa->sin6; pingaddr = lsa->u.sin6;
pkt = (struct icmp6_hdr *) packet; pkt = (struct icmp6_hdr *) packet;
memset(pkt, 0, sizeof(packet)); memset(pkt, 0, sizeof(packet));