Page MenuHomeFreeBSD
Files F153680093

D21345.id61052.diff
No OneTemporary
Actions

D21345.id61052.diff
View Options

Index: sbin/ping6/ping6.8
===================================================================
--- sbin/ping6/ping6.8
+++ sbin/ping6/ping6.8
@@ -40,11 +40,11 @@
.Sh SYNOPSIS
.Nm
.\" without ipsec, or new ipsec
-.Op Fl DdfmnNoqrRtvwW
+.Op Fl DdfunNoqaAyvwY
.\" old ipsec
.\" .Op Fl ADdEfmnNqRtvwW
.Bk -words
-.Op Fl a Ar addrtype
+.Op Fl k Ar addrtype
.Ek
.Bk -words
.Op Fl b Ar bufsiz
@@ -53,10 +53,10 @@
.Op Fl c Ar count
.Ek
.Bk -words
-.Op Fl g Ar gateway
+.Op Fl e Ar gateway
.Ek
.Bk -words
-.Op Fl h Ar hoplimit
+.Op Fl j Ar hoplimit
.Ek
.Bk -words
.Op Fl I Ar interface
@@ -65,10 +65,10 @@
.Op Fl i Ar wait
.Ek
.Bk -words
-.Op Fl x Ar waittime
+.Op Fl W Ar waittime
.Ek
.Bk -words
-.Op Fl X Ar timeout
+.Op Fl t Ar timeout
.Ek
.Bk -words
.Op Fl l Ar preload
@@ -113,7 +113,7 @@
.\" .It Fl A
.\" Enables transport-mode IPsec authentication header
.\" (experimental).
-.It Fl a Ar addrtype
+.It Fl k Ar addrtype
Generate ICMPv6 Node Information Node Addresses query, rather than echo-request.
.Ar addrtype
must be a string constructed of the following characters.
@@ -172,12 +172,12 @@
.Bf -emphasis
This can be very hard on a network and should be used with caution.
.Ef
-.It Fl g Ar gateway
+.It Fl e Ar gateway
Specifies to use
.Ar gateway
as the next hop to the destination.
The gateway must be a neighbor of the sending node.
-.It Fl h Ar hoplimit
+.It Fl j Ar hoplimit
Set the IPv6 hoplimit.
.It Fl I Ar interface
Source packets with the given interface address.
@@ -192,12 +192,12 @@
This option is incompatible with the
.Fl f
option.
-.It Fl x Ar waittime
+.It Fl W Ar waittime
Time in milliseconds to wait for a reply for each packet sent.
If a reply arrives later,
the packet is not printed as replied,
but considered as replied when calculating statistics.
-.It Fl X Ar timeout
+.It Fl t Ar timeout
Specify a timeout,
in seconds,
before ping exits regardless of how many packets have been received.
@@ -209,12 +209,12 @@
sends that many packets as fast as possible before falling into its normal
mode of behavior.
Only the super-user may use this option.
-.It Fl m
+.It Fl u
By default,
.Nm
asks the kernel to fragment packets to fit into the minimum IPv6 MTU.
The
-.Fl m
+.Fl u
option
will suppress the behavior in the following two levels:
when the option is specified once, the behavior will be disabled for
@@ -265,13 +265,13 @@
Quiet output.
Nothing is displayed except the summary lines at startup time and
when finished.
-.It Fl r
+.It Fl a
Audible.
Include a bell
.Tn ( ASCII
0x07)
character in the output when any packet is received.
-.It Fl R
+.It Fl A
Audible.
Output a bell
.Tn ( ASCII
@@ -296,12 +296,12 @@
You may need to specify
.Fl b
as well to extend socket buffer size.
-.It Fl t
+.It Fl y
Generate ICMPv6 Node Information supported query types query,
rather than echo-request.
.Fl s
has no effect if
-.Fl t
+.Fl y
is specified.
.It Fl v
Verbose output.
@@ -315,7 +315,7 @@
has no effect if
.Fl w
is specified.
-.It Fl W
+.It Fl Y
Same as
.Fl w ,
but with old packet format based on 03 draft.
@@ -474,7 +474,7 @@
The following will probe addresses assigned to the destination node,
.Li dst.foo.com .
.Bd -literal -offset indent
-ping6 -a agl dst.foo.com
+ping6 -k agl dst.foo.com
.Ed
.Sh SEE ALSO
.Xr netstat 1 ,
Index: sbin/ping6/ping6.c
===================================================================
--- sbin/ping6/ping6.c
+++ sbin/ping6/ping6.c
@@ -347,14 +347,14 @@
#ifdef IPSEC_POLICY_IPSEC
#define ADDOPTS "P:"
#else
-#define ADDOPTS "AE"
+#define ADDOPTS "ZE"
#endif /*IPSEC_POLICY_IPSEC*/
#endif
while ((ch = getopt(argc, argv,
- "a:b:c:DdfHg:h:I:i:l:mnNop:qrRS:s:tvwWx:X:" ADDOPTS)) != -1) {
+ "k:b:c:Ddf e:j:I:i:l:unNop:qaAS:s:yvwYW:t:" ADDOPTS)) != -1) {
#undef ADDOPTS
switch (ch) {
- case 'a':
+ case 'k':
{
char *cp;
@@ -431,10 +431,10 @@
options |= F_FLOOD;
setbuf(stdout, (char *)NULL);
break;
- case 'g':
+ case 'e':
gateway = optarg;
break;
- case 'h': /* hoplimit */
+ case 'j': /* hoplimit */
hoplimit = strtol(optarg, &e, 10);
if (*optarg == '\0' || *e != '\0')
errx(1, "illegal hoplimit %s", optarg);
@@ -478,7 +478,7 @@
if (preload < 0 || *optarg == '\0' || *e != '\0')
errx(1, "illegal preload value -- %s", optarg);
break;
- case 'm':
+ case 'u':
#ifdef IPV6_USE_MIN_MTU
mflag++;
break;
@@ -503,10 +503,10 @@
case 'q':
options |= F_QUIET;
break;
- case 'r':
+ case 'a':
options |= F_AUDIBLE;
break;
- case 'R':
+ case 'A':
options |= F_MISSED;
break;
case 'S':
@@ -540,7 +540,7 @@
MAXDATALEN);
}
break;
- case 't':
+ case 'y':
options &= ~F_NOUSERDATA;
options |= F_SUPTYPES;
break;
@@ -551,11 +551,11 @@
options &= ~F_NOUSERDATA;
options |= F_FQDN;
break;
- case 'W':
+ case 'Y':
options &= ~F_NOUSERDATA;
options |= F_FQDNOLD;
break;
- case 'x':
+ case 'W':
t = strtod(optarg, &e);
if (*e || e == optarg || t > (double)INT_MAX)
err(EX_USAGE, "invalid timing interval: `%s'",
@@ -563,7 +563,7 @@
options |= F_WAITTIME;
waittime = (int)t;
break;
- case 'X':
+ case 't':
alarmtimeout = strtoul(optarg, &e, 0);
if ((alarmtimeout < 1) || (alarmtimeout == ULONG_MAX))
errx(EX_USAGE, "invalid timeout: `%s'",
@@ -587,7 +587,7 @@
errx(1, "invalid security policy");
break;
#else
- case 'A':
+ case 'Z':
options |= F_AUTHHDR;
break;
case 'E':

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 23, 9:15 PM (17 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32045222
Default Alt Text
D21345.id61052.diff (5 KB)

Event Timeline