d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add '-t X' which times out after pinging for X seconds.

Browse Source 
Submitted by:	adrian
This commit is contained in:
billf 2000-01-14 23:40:38 +00:00
parent 8fe9ae191d
commit ca5b317836
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/ping/ping.8
View File

@ -219,6 +219,9 @@ force the source address to be something other than the IP address
of the interface the probe packet is sent on. If the IP address of the interface the probe packet is sent on. If the IP address
is not one of this machine's interface addresses, an error is is not one of this machine's interface addresses, an error is
returned and nothing is sent. returned and nothing is sent.
.It Fl t Ar timeout
Specify a timeout, in seconds, before ping exits regardless of how
many packets have been recieved.
.It Fl T Ar ttl .It Fl T Ar ttl
Set the IP Time To Live for multicasted packets. Set the IP Time To Live for multicasted packets.
This flag only applies if the ping destination is a multicast address. This flag only applies if the ping destination is a multicast address.

19
sbin/ping/ping.c
View File

@ -217,6 +217,7 @@ main(argc, argv)
char *policy_in = NULL; char *policy_in = NULL;
char *policy_out = NULL; char *policy_out = NULL;
#endif #endif
int alarmtimeout = 0;
/* /*
* Do the stuff that we need root priv's for *first*, and * Do the stuff that we need root priv's for *first*, and
@ -233,10 +234,10 @@ main(argc, argv)
datap = &outpack[8 + PHDR_LEN]; datap = &outpack[8 + PHDR_LEN];
#ifndef IPSEC #ifndef IPSEC
while ((ch = getopt(argc, argv, "I:LQRT:c:adfi:l:np:qrs:v")) != -1) while ((ch = getopt(argc, argv, "I:LQRT:c:adfi:l:np:qrs:t:v")) != -1)
#else #else
#ifdef IPSEC_POLICY_IPSEC #ifdef IPSEC_POLICY_IPSEC
while ((ch = getopt(argc, argv, "I:LQRT:c:adfi:l:np:qrs:vP:")) != -1) while ((ch = getopt(argc, argv, "I:LQRT:c:adfi:l:np:qrs:t:vP:")) != -1)
#endif /*IPSEC_POLICY_IPSEC*/ #endif /*IPSEC_POLICY_IPSEC*/
#endif #endif
{ {
@ -340,6 +341,13 @@ main(argc, argv)
case 'S': case 'S':
source = optarg; source = optarg;
break; break;
case 't':
alarmtimeout = (int)strtoul(optarg, &ep, 0);
if (alarmtimeout < 1)
errx(EX_USAGE, "invalid timeout: `%s'",
optarg);
alarm(alarmtimeout);
break;
case 'T': /* multicast TTL */ case 'T': /* multicast TTL */
ultmp = strtoul(optarg, &ep, 0); ultmp = strtoul(optarg, &ep, 0);
if (*ep || ep == optarg || ultmp > 255) if (*ep || ep == optarg || ultmp > 255)
@ -558,6 +566,9 @@ main(argc, argv)
if (sigaction(SIGINFO, &si_sa, 0) == -1) { if (sigaction(SIGINFO, &si_sa, 0) == -1) {
err(EX_OSERR, "sigaction"); err(EX_OSERR, "sigaction");
} }
si_sa.sa_handler = stopit;
if (sigaction(SIGALRM, &si_sa, 0) == -1)
err(EX_OSERR, "sigaction SIGALRM");
bzero(&msg, sizeof(msg)); bzero(&msg, sizeof(msg));
msg.msg_name = (caddr_t)&from; msg.msg_name = (caddr_t)&from;
@ -1391,7 +1402,7 @@ usage()
"[-P policy] " "[-P policy] "
#endif #endif
#endif #endif
"[-s packetsize] [-S src_addr]", "[-s packetsize] [-S src_addr] [-t timeout]",
"[host | [-L] [-I iface] [-T ttl] mcast-group]"); " [host | [-L] [-I iface] [-T ttl] mcast-group]");
exit(EX_USAGE); exit(EX_USAGE);
} }