diff options
| author | Sebastian Benoit <benno@cvs.openbsd.org> | 2017-11-17 18:04:52 +0000 |
|---|---|---|
| committer | Sebastian Benoit <benno@cvs.openbsd.org> | 2017-11-17 18:04:52 +0000 |
| commit | 90aab41b166fa234b7f4eaab9bc9c8eedc11fb22 (patch) | |
| tree | cf26452d3b2f7c7ffdb8a03d586f51a3695244a1 /sbin | |
| parent | df91e11402378307649df48b6201464a85bf11c8 (diff) | |
replace the deletetunnel option with -tunnel
ok bluhm@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ifconfig/ifconfig.8 | 11 | ||||
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 0e9da423f0c..84eb7091424 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifconfig.8,v 1.288 2017/09/14 13:02:12 benno Exp $ +.\" $OpenBSD: ifconfig.8,v 1.289 2017/11/17 18:04:51 benno Exp $ .\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $ .\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $ .\" @@ -31,7 +31,7 @@ .\" .\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94 .\" -.Dd $Mdocdate: September 14 2017 $ +.Dd $Mdocdate: November 17 2017 $ .Dt IFCONFIG 8 .Os .Sh NAME @@ -1531,9 +1531,8 @@ for a complete list of the available protocols. .Bk -words .Nm ifconfig .Ar tunnel-interface -.Op Cm deletetunnel Ar src_address dest_address .Op Oo Fl Oc Ns Cm keepalive Ar period count -.Op Cm tunnel Ar src_address dest_address +.Op Oo Fl Oc Ns Cm tunnel Ar src_address dest_address .Op Cm tunneldomain Ar tableid .Op Oo Fl Oc Ns Cm vnetid Ar network-id .Ek @@ -1547,8 +1546,6 @@ and are all tunnel interfaces. The following options are available: .Bl -tag -width Ds -.It Cm deletetunnel Ar src_address dest_address -Remove the source and destination tunnel addresses. .It Cm keepalive Ar period count Enable .Xr gre 4 @@ -1576,6 +1573,8 @@ Both addresses must be of the same family. The optional destination port can be specified for interfaces such as .Xr vxlan 4 , which further encapsulate the packets in UDP datagrams. +.It Cm -tunnel +Remove the source and destination tunnel addresses. .It Cm tunneldomain Ar tableid Use routing table .Ar tableid diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 5ad411ffbae..e05aedf8262 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.350 2017/11/05 22:09:26 benno Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.351 2017/11/17 18:04:51 benno Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -424,10 +424,12 @@ const struct cmd { { "maxupd", NEXTARG, 0, setpfsync_maxupd }, { "defer", 1, 0, setpfsync_defer }, { "-defer", 0, 0, setpfsync_defer }, - { "tunnel", NEXTARG2, 0, NULL, settunnel } , - { "deletetunnel", 0, 0, deletetunnel } , - { "tunneldomain", NEXTARG, 0, settunnelinst } , - { "tunnelttl", NEXTARG, 0, settunnelttl } , + { "tunnel", NEXTARG2, 0, NULL, settunnel }, + { "-tunnel", 0, 0, deletetunnel }, + /* deletetunnel is for backward compat, remove during 6.4-current */ + { "deletetunnel", 0, 0, deletetunnel }, + { "tunneldomain", NEXTARG, 0, settunnelinst }, + { "tunnelttl", NEXTARG, 0, settunnelttl }, { "pppoedev", NEXTARG, 0, setpppoe_dev }, { "pppoesvc", NEXTARG, 0, setpppoe_svc }, { "-pppoesvc", 1, 0, setpppoe_svc }, |