diff options
| author | Paul Fox | 2008-02-01 23:25:32 +0000 |
|---|---|---|
| committer | Paul Fox | 2008-02-01 23:25:32 +0000 |
| commit | 0b2b5842a1c47bc7a3f872e9d06ab2bcc2cf4be8 (patch) | |
| tree | 1e3dc018905c176c7c872670b6a0736bc82bfc5c | |
| parent | f0044c480c4da9c5818fe7a0973cd5529314d14b (diff) | |
| download | busybox-0b2b5842a1c47bc7a3f872e9d06ab2bcc2cf4be8.zip busybox-0b2b5842a1c47bc7a3f872e9d06ab2bcc2cf4be8.tar.gz | |
Fix compilation error when FEATURE_FANCY_PING enabled. Also
reorder networking/Config.in moving FEATURE_FANCY_PING next to
PING6. (Cristian Ionescu-Idbohrn)
| -rw-r--r-- | networking/Config.in | 12 | ||||
| -rw-r--r-- | networking/ping.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/networking/Config.in b/networking/Config.in index cd986b8..e8820e1 100644 --- a/networking/Config.in +++ b/networking/Config.in @@ -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 diff --git a/networking/ping.c b/networking/ping.c index 382389d..11138c0 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -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)); |