ping: support -I addr in family neutral manner; reuse a bit of common code

This commit is contained in:
Denis Vlasenko
2007-02-09 17:32:16 +00:00
parent d244c5eaf8
commit 9ca26d38c5
4 changed files with 43 additions and 52 deletions

View File

@@ -321,6 +321,7 @@ int xconnect_stream(const len_and_sockaddr *lsa);
len_and_sockaddr* host2sockaddr(const char *host, int port);
/* Version which dies on error */
len_and_sockaddr* xhost2sockaddr(const char *host, int port);
len_and_sockaddr* xdotted2sockaddr(const char *host, int port);
#if ENABLE_FEATURE_IPV6
/* Same, useful if you want to force family (e.g. IPv6) */
len_and_sockaddr* host_and_af2sockaddr(const char *host, int port, sa_family_t af);

View File

@@ -2428,20 +2428,22 @@
#define ping_full_usage \
"Send ICMP ECHO_REQUEST packets to network hosts" \
"\n\nOptions:\n" \
" -c CNT Send only CNT pings\n" \
" -s SIZE Send SIZE data bytes in packets (default=56)\n" \
" -I IP Use IP as source address\n" \
" -q Quiet mode, only displays output at start\n" \
" and when finished"
" -4, -6 Force IPv4 or IPv6 hostname resolution\n" \
" -c CNT Send only CNT pings\n" \
" -s SIZE Send SIZE data bytes in packets (default=56)\n" \
" -I iface/IP Use interface or IP address as source\n" \
" -q Quiet mode, only displays output at start\n" \
" and when finished"
#define ping6_trivial_usage \
"[OPTION]... host"
#define ping6_full_usage \
"Send ICMP ECHO_REQUEST packets to network hosts" \
"\n\nOptions:\n" \
" -c CNT Send only CNT pings\n" \
" -s SIZE Send SIZE data bytes in packets (default=56)\n" \
" -q Quiet mode, only displays output at start\n" \
" and when finished"
" -c CNT Send only CNT pings\n" \
" -s SIZE Send SIZE data bytes in packets (default=56)\n" \
" -I iface/IP Use interface or IP address as source\n" \
" -q Quiet mode, only displays output at start\n" \
" and when finished"
#endif
#define ping_example_usage \
"$ ping localhost\n" \