Fix compilation error when FEATURE_FANCY_PING enabled. Also reorder networking/Config.in moving FEATURE_FANCY_PING next to PING6. (Cristian Ionescu-Idbohrn)
No binary (build failed)
—
(log yok)
| @@ -645,12 +645,6 @@ config PING6 | |
| 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 @@ config FEATURE_FANCY_PING | |
| 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 | |
| @@ -94,7 +94,7 @@ static void ping4(len_and_sockaddr *lsa) | |
| 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 @@ static void ping6(len_and_sockaddr *lsa) | |
| 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)); | |