summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakoshibe <akoshibe@openbsd.org>2019-05-10 18:27:50 +0000
committerakoshibe <akoshibe@openbsd.org>2019-05-10 18:27:50 +0000
commitc049ce41f9adbe84de08e19fee3a5cbb0e0cb985 (patch)
tree0af0f23926db298a089035c027cfad361613ecd7
parentAdd a fallback to ehci(4)'s phy init code so that when there (diff)
downloadwireguard-openbsd-c049ce41f9adbe84de08e19fee3a5cbb0e0cb985.tar.xz
wireguard-openbsd-c049ce41f9adbe84de08e19fee3a5cbb0e0cb985.zip
Document port protection support in switch(4). Also add SIOCBRDGSIFPROT to
list of ioctls in bridge(4). OK ccardenas@ kn@ phessler@
-rw-r--r--sbin/ifconfig/ifconfig.818
-rw-r--r--share/man/man4/bridge.49
-rw-r--r--share/man/man4/switch.46
3 files changed, 27 insertions, 6 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index adc7fa737fc..c28490708f7 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.334 2019/04/19 04:30:57 dlg Exp $
+.\" $OpenBSD: ifconfig.8,v 1.335 2019/05/10 18:27:50 akoshibe 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: April 19 2019 $
+.Dd $Mdocdate: May 10 2019 $
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -1626,6 +1626,20 @@ Set the port number for the port named
.Ar interface .
The default value is the interface index of the
.Ar interface .
+.It Cm protected Ar interface ids
+Put
+.Ar interface
+in protected domains.
+.Ar ids
+is a comma delimited list of domain IDs, between 1 and 31, to put the
+interface in.
+Interfaces that are part of a protected domain cannot forward traffic to any
+other interface in that domain.
+Interfaces do not belong to any protected domain by default.
+.It Cm -protected Ar interface
+Remove
+.Ar interface
+from all protected domains.
.It Cm up
Start the switch processing packets.
.El
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index cb67c4e4a6b..fa8f411b135 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bridge.4,v 1.76 2017/10/24 09:36:13 jsg Exp $
+.\" $OpenBSD: bridge.4,v 1.77 2019/05/10 18:27:50 akoshibe Exp $
.\"
.\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net)
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: October 24 2017 $
+.Dd $Mdocdate: May 10 2019 $
.Dt BRIDGE 4
.Os
.Sh NAME
@@ -561,6 +561,11 @@ to the value in
The value in
.Va ifbr_path_cost
must be greater than or equal to one.
+.It Dv SIOCBRDGSIFPROT Fa "struct ifbreq *"
+Set the protection domain membership of the interface named in
+.Va ifbr_ifsname
+to the value in
+.Va ifbr_protected .
.El
.Sh ERRORS
If the
diff --git a/share/man/man4/switch.4 b/share/man/man4/switch.4
index 161e7589e6e..859ef52409f 100644
--- a/share/man/man4/switch.4
+++ b/share/man/man4/switch.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: switch.4,v 1.8 2017/10/24 09:36:13 jsg Exp $
+.\" $OpenBSD: switch.4,v 1.9 2019/05/10 18:27:50 akoshibe Exp $
.\"
.\" Copyright (c) 2016 YASUOKA Masahiko <yasuoka@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: October 24 2017 $
+.Dd $Mdocdate: May 10 2019 $
.Dt SWITCH 4
.Os
.Sh NAME
@@ -92,6 +92,8 @@ and
.Dv SIOCBRDGDEL
.It
.Dv SIOCBRDGGIFFLGS
+.It
+.Dv SIOCBRDGSIFPROT
.El
.Pp
The following