summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2018-12-12 08:55:44 +0000
committerclaudio <claudio@openbsd.org>2018-12-12 08:55:44 +0000
commit64ceb41ea2210cc8927c8cd99b97c1e6a64f7ee6 (patch)
tree7321061f152c1dbb39506a3f96c8c08c1084dba8
parentMake kcov MP-safe. Calling the injected tracing function (diff)
downloadwireguard-openbsd-64ceb41ea2210cc8927c8cd99b97c1e6a64f7ee6.tar.xz
wireguard-openbsd-64ceb41ea2210cc8927c8cd99b97c1e6a64f7ee6.zip
Enable the rules doing more than one match at a time. This works since a while.
-rw-r--r--regress/usr.sbin/bgpd/config/bgpd.conf.10.in10
-rw-r--r--regress/usr.sbin/bgpd/config/bgpd.conf.10.ok4
2 files changed, 9 insertions, 5 deletions
diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.10.in b/regress/usr.sbin/bgpd/config/bgpd.conf.10.in
index cb6c658cf23..468a54e6e77 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.10.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.10.in
@@ -1,4 +1,4 @@
-# $OpenBSD: bgpd.conf.10.in,v 1.1 2018/11/13 16:54:30 claudio Exp $
+# $OpenBSD: bgpd.conf.10.in,v 1.2 2018/12/12 08:55:44 claudio Exp $
# test communities
AS 64512
@@ -12,8 +12,8 @@ match from any community 1234:local-as
match from any community 1234:neighbor-as
match from any community 1234:*
match from any community *:*
-#match from any community 1234:1 community 1234:2
-#match from any community 1234:1 community 1234:2 community 1234:3
+match from any community 1234:1 community 1234:2
+match from any community 1234:1 community 1234:2 community 1234:3
# wellknown communities
match from any community BLACKHOLE
@@ -38,8 +38,8 @@ match from any large-community 1234:*:*
match from any large-community *:5678:*
match from any large-community *:*:90
match from any large-community *:*:*
-#match from any large-community 1234:5678:1 large-community 1234:5678:2
-#match from any large-community 1234:5678:1 large-community 1234:5678:2 large-community 1234:5678:3
+match from any large-community 1234:5678:1 large-community 1234:5678:2
+match from any large-community 1234:5678:1 large-community 1234:5678:2 large-community 1234:5678:3
# mixing
match from any community 1234:1 large-community 1234:5678:1
diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok
index 8cd9ab46ac0..9a2bcbefd5e 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok
@@ -17,6 +17,8 @@ match from any community 1234:local-as
match from any community 1234:neighbor-as
match from any community 1234:*
match from any community *:*
+match from any community 1234:1 community 1234:2
+match from any community 1234:1 community 1234:2 community 1234:3
match from any community 65535:666
match from any community 65535:0
match from any community 65535:65281
@@ -37,6 +39,8 @@ match from any large-community 1234:*:*
match from any large-community *:5678:*
match from any large-community *:*:90
match from any large-community *:*:*
+match from any large-community 1234:5678:1 large-community 1234:5678:2
+match from any large-community 1234:5678:1 large-community 1234:5678:2 large-community 1234:5678:3
match from any community 1234:1 large-community 1234:5678:1
match from any large-community 1234:5678:1 community 1234:1
match from any set { community delete 1234:5678 community delete 1234:* community delete *:5678 community delete local-as:5678 community delete local-as:neighbor-as large-community delete 1234:15:5678 large-community delete *:15:5678 large-community delete local-as:15:5678 large-community delete local-as:15:* large-community delete local-as:15:neighbor-as large-community delete local-as:*:* community 1234:5678 community local-as:5678 community local-as:neighbor-as large-community 1234:15:5678 large-community local-as:15:5678 large-community local-as:15:neighbor-as }