summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/sbin/pfctl/binat1.in16
-rw-r--r--regress/sbin/pfctl/binat1.ok16
-rw-r--r--regress/sbin/pfctl/pf2.in42
-rw-r--r--regress/sbin/pfctl/pf2.ok42
-rw-r--r--regress/sbin/pfctl/pf7.in42
-rw-r--r--regress/sbin/pfctl/pf7.ok42
-rw-r--r--regress/sbin/pfctl/pf8.in2
-rw-r--r--regress/sbin/pfctl/pf8.ok4
-rw-r--r--regress/sbin/pfctl/pf9.in2
-rw-r--r--regress/sbin/pfctl/pf9.ok6
10 files changed, 107 insertions, 107 deletions
diff --git a/regress/sbin/pfctl/binat1.in b/regress/sbin/pfctl/binat1.in
index a9ee3be7d8b..49e9eb0ecab 100644
--- a/regress/sbin/pfctl/binat1.in
+++ b/regress/sbin/pfctl/binat1.in
@@ -1,12 +1,12 @@
# test binat
-binat on fxp0 from 192.168.1.1 to any -> 10.0.0.1
-binat on fxp0 proto tcp from 192.168.1.2 to any -> 10.0.0.2
-binat on fxp0 proto udp from 192.168.1.3 to any -> 10.0.0.3
-binat on fxp0 proto icmp from 192.168.1.4 to any -> 10.0.0.4
+binat on lo0 from 192.168.1.1 to any -> 10.0.0.1
+binat on lo0 proto tcp from 192.168.1.2 to any -> 10.0.0.2
+binat on lo0 proto udp from 192.168.1.3 to any -> 10.0.0.3
+binat on lo0 proto icmp from 192.168.1.4 to any -> 10.0.0.4
-binat on fxp0 from 192.168.1.5 to 172.16.1.1 -> 10.0.0.5
-binat on fxp0 from 192.168.1.6 to 172.16.1.2/32 -> 10.0.0.6
-binat on fxp0 from 192.168.1.7 to 172.16.2.0/24 -> 10.0.0.7
+binat on lo0 from 192.168.1.5 to 172.16.1.1 -> 10.0.0.5
+binat on lo0 from 192.168.1.6 to 172.16.1.2/32 -> 10.0.0.6
+binat on lo0 from 192.168.1.7 to 172.16.2.0/24 -> 10.0.0.7
-binat on fxp0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
+binat on lo0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
diff --git a/regress/sbin/pfctl/binat1.ok b/regress/sbin/pfctl/binat1.ok
index 2e7c6d39f54..576b6255446 100644
--- a/regress/sbin/pfctl/binat1.ok
+++ b/regress/sbin/pfctl/binat1.ok
@@ -1,8 +1,8 @@
-@binat on fxp0 from 192.168.1.1 to any -> 10.0.0.1
-@binat on fxp0 proto tcp from 192.168.1.2 to any -> 10.0.0.2
-@binat on fxp0 proto udp from 192.168.1.3 to any -> 10.0.0.3
-@binat on fxp0 proto icmp from 192.168.1.4 to any -> 10.0.0.4
-@binat on fxp0 from 192.168.1.5 to 172.16.1.1/32 -> 10.0.0.5
-@binat on fxp0 from 192.168.1.6 to 172.16.1.2/32 -> 10.0.0.6
-@binat on fxp0 from 192.168.1.7 to 172.16.2.0/24 -> 10.0.0.7
-@binat on fxp0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
+@binat on lo0 from 192.168.1.1 to any -> 10.0.0.1
+@binat on lo0 proto tcp from 192.168.1.2 to any -> 10.0.0.2
+@binat on lo0 proto udp from 192.168.1.3 to any -> 10.0.0.3
+@binat on lo0 proto icmp from 192.168.1.4 to any -> 10.0.0.4
+@binat on lo0 from 192.168.1.5 to 172.16.1.1/32 -> 10.0.0.5
+@binat on lo0 from 192.168.1.6 to 172.16.1.2/32 -> 10.0.0.6
+@binat on lo0 from 192.168.1.7 to 172.16.2.0/24 -> 10.0.0.7
+@binat on lo0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
diff --git a/regress/sbin/pfctl/pf2.in b/regress/sbin/pfctl/pf2.in
index 122f320a86e..ba509ebec67 100644
--- a/regress/sbin/pfctl/pf2.in
+++ b/regress/sbin/pfctl/pf2.in
@@ -1,32 +1,32 @@
# test
-block out log on kue0 all
-block in log on kue0 all
+block out log on tun0 all
+block in log on tun0 all
-block return-rst out log on kue0 proto tcp all
-block return-rst in log on kue0 proto tcp all
-block return-icmp out log on kue0 proto udp all
-block return-icmp in log on kue0 proto udp all
+block return-rst out log on tun0 proto tcp all
+block return-rst in log on tun0 proto tcp all
+block return-icmp out log on tun0 proto udp all
+block return-icmp in log on tun0 proto udp all
-block out log quick on kue0 from ! 157.161.48.183 to any
+block out log quick on tun0 from ! 157.161.48.183 to any
-block in quick on kue0 from any to 255.255.255.255
+block in quick on tun0 from any to 255.255.255.255
-block in log quick on kue0 from 10.0.0.0/8 to any
-block in log quick on kue0 from 172.16.0.0/12 to any
-block in log quick on kue0 from 192.168.0.0/16 to any
-block in log quick on kue0 from 255.255.255.255/32 to any
+block in log quick on tun0 from 10.0.0.0/8 to any
+block in log quick on tun0 from 172.16.0.0/12 to any
+block in log quick on tun0 from 192.168.0.0/16 to any
+block in log quick on tun0 from 255.255.255.255/32 to any
-pass out on kue0 inet proto icmp all icmp-type 8 code 0 keep state
-pass in on kue0 inet proto icmp all icmp-type 8 code 0 keep state
+pass out on tun0 inet proto icmp all icmp-type 8 code 0 keep state
+pass in on tun0 inet proto icmp all icmp-type 8 code 0 keep state
-pass out on kue0 proto udp all keep state
+pass out on tun0 proto udp all keep state
-pass in on kue0 proto udp from any to any port = domain keep state
+pass in on tun0 proto udp from any to any port = domain keep state
-pass out on kue0 proto tcp all keep state
+pass out on tun0 proto tcp all keep state
-pass in on kue0 proto tcp from any to any port = ssh keep state
-pass in on kue0 proto tcp from any to any port = smtp keep state
-pass in on kue0 proto tcp from any to any port = domain keep state
-pass in on kue0 proto tcp from any to any port = auth keep state
+pass in on tun0 proto tcp from any to any port = ssh keep state
+pass in on tun0 proto tcp from any to any port = smtp keep state
+pass in on tun0 proto tcp from any to any port = domain keep state
+pass in on tun0 proto tcp from any to any port = auth keep state
diff --git a/regress/sbin/pfctl/pf2.ok b/regress/sbin/pfctl/pf2.ok
index c3454b6b928..88b99c002da 100644
--- a/regress/sbin/pfctl/pf2.ok
+++ b/regress/sbin/pfctl/pf2.ok
@@ -1,21 +1,21 @@
-@0 block out log on kue0 all
-@0 block in log on kue0 all
-@0 block return-rst out log on kue0 proto tcp all
-@0 block return-rst in log on kue0 proto tcp all
-@0 block return-icmp out log on kue0 proto udp all
-@0 block return-icmp in log on kue0 proto udp all
-@0 block out log quick on kue0 inet from ! 157.161.48.183/32 to any
-@0 block in quick on kue0 inet from any to 255.255.255.255/32
-@0 block in log quick on kue0 inet from 10.0.0.0/8 to any
-@0 block in log quick on kue0 inet from 172.16.0.0/12 to any
-@0 block in log quick on kue0 inet from 192.168.0.0/16 to any
-@0 block in log quick on kue0 inet from 255.255.255.255/32 to any
-@0 pass out on kue0 inet proto icmp all icmp-type echoreq code 0 keep state
-@0 pass in on kue0 inet proto icmp all icmp-type echoreq code 0 keep state
-@0 pass out on kue0 proto udp all keep state
-@0 pass in on kue0 proto udp from any to any port = domain keep state
-@0 pass out on kue0 proto tcp all keep state
-@0 pass in on kue0 proto tcp from any to any port = ssh keep state
-@0 pass in on kue0 proto tcp from any to any port = smtp keep state
-@0 pass in on kue0 proto tcp from any to any port = domain keep state
-@0 pass in on kue0 proto tcp from any to any port = auth keep state
+@0 block out log on tun0 all
+@0 block in log on tun0 all
+@0 block return-rst out log on tun0 proto tcp all
+@0 block return-rst in log on tun0 proto tcp all
+@0 block return-icmp out log on tun0 proto udp all
+@0 block return-icmp in log on tun0 proto udp all
+@0 block out log quick on tun0 inet from ! 157.161.48.183/32 to any
+@0 block in quick on tun0 inet from any to 255.255.255.255/32
+@0 block in log quick on tun0 inet from 10.0.0.0/8 to any
+@0 block in log quick on tun0 inet from 172.16.0.0/12 to any
+@0 block in log quick on tun0 inet from 192.168.0.0/16 to any
+@0 block in log quick on tun0 inet from 255.255.255.255/32 to any
+@0 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state
+@0 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state
+@0 pass out on tun0 proto udp all keep state
+@0 pass in on tun0 proto udp from any to any port = domain keep state
+@0 pass out on tun0 proto tcp all keep state
+@0 pass in on tun0 proto tcp from any to any port = ssh keep state
+@0 pass in on tun0 proto tcp from any to any port = smtp keep state
+@0 pass in on tun0 proto tcp from any to any port = domain keep state
+@0 pass in on tun0 proto tcp from any to any port = auth keep state
diff --git a/regress/sbin/pfctl/pf7.in b/regress/sbin/pfctl/pf7.in
index 4aeee744e03..698a6f20ba4 100644
--- a/regress/sbin/pfctl/pf7.in
+++ b/regress/sbin/pfctl/pf7.in
@@ -1,32 +1,32 @@
# test modulate state
-block out log on kue0 all
-block in log on kue0 all
+block out log on tun0 all
+block in log on tun0 all
-block return-rst out log on kue0 proto tcp all
-block return-rst in log on kue0 proto tcp all
-block return-icmp out log on kue0 proto udp all
-block return-icmp in log on kue0 proto udp all
+block return-rst out log on tun0 proto tcp all
+block return-rst in log on tun0 proto tcp all
+block return-icmp out log on tun0 proto udp all
+block return-icmp in log on tun0 proto udp all
-block out log quick on kue0 from ! 157.161.48.183 to any
+block out log quick on tun0 from ! 157.161.48.183 to any
-block in quick on kue0 from any to 255.255.255.255
+block in quick on tun0 from any to 255.255.255.255
-block in log quick on kue0 from 10.0.0.0/8 to any
-block in log quick on kue0 from 172.16.0.0/12 to any
-block in log quick on kue0 from 192.168.0.0/16 to any
-block in log quick on kue0 from 255.255.255.255/32 to any
+block in log quick on tun0 from 10.0.0.0/8 to any
+block in log quick on tun0 from 172.16.0.0/12 to any
+block in log quick on tun0 from 192.168.0.0/16 to any
+block in log quick on tun0 from 255.255.255.255/32 to any
-pass out on kue0 inet proto icmp all icmp-type 8 code 0 keep state
-pass in on kue0 inet proto icmp all icmp-type 8 code 0 keep state
+pass out on tun0 inet proto icmp all icmp-type 8 code 0 keep state
+pass in on tun0 inet proto icmp all icmp-type 8 code 0 keep state
-pass out on kue0 proto udp all keep state
+pass out on tun0 proto udp all keep state
-pass in on kue0 proto udp from any to any port = domain keep state
+pass in on tun0 proto udp from any to any port = domain keep state
-pass out on kue0 proto tcp all modulate state
+pass out on tun0 proto tcp all modulate state
-pass in on kue0 proto tcp from any to any port = ssh modulate state
-pass in on kue0 proto tcp from any to any port = smtp modulate state
-pass in on kue0 proto tcp from any to any port = domain modulate state
-pass in on kue0 proto tcp from any to any port = auth modulate state
+pass in on tun0 proto tcp from any to any port = ssh modulate state
+pass in on tun0 proto tcp from any to any port = smtp modulate state
+pass in on tun0 proto tcp from any to any port = domain modulate state
+pass in on tun0 proto tcp from any to any port = auth modulate state
diff --git a/regress/sbin/pfctl/pf7.ok b/regress/sbin/pfctl/pf7.ok
index ea338df7636..2a9b393ba70 100644
--- a/regress/sbin/pfctl/pf7.ok
+++ b/regress/sbin/pfctl/pf7.ok
@@ -1,21 +1,21 @@
-@0 block out log on kue0 all
-@0 block in log on kue0 all
-@0 block return-rst out log on kue0 proto tcp all
-@0 block return-rst in log on kue0 proto tcp all
-@0 block return-icmp out log on kue0 proto udp all
-@0 block return-icmp in log on kue0 proto udp all
-@0 block out log quick on kue0 inet from ! 157.161.48.183/32 to any
-@0 block in quick on kue0 inet from any to 255.255.255.255/32
-@0 block in log quick on kue0 inet from 10.0.0.0/8 to any
-@0 block in log quick on kue0 inet from 172.16.0.0/12 to any
-@0 block in log quick on kue0 inet from 192.168.0.0/16 to any
-@0 block in log quick on kue0 inet from 255.255.255.255/32 to any
-@0 pass out on kue0 inet proto icmp all icmp-type echoreq code 0 keep state
-@0 pass in on kue0 inet proto icmp all icmp-type echoreq code 0 keep state
-@0 pass out on kue0 proto udp all keep state
-@0 pass in on kue0 proto udp from any to any port = domain keep state
-@0 pass out on kue0 proto tcp all modulate state
-@0 pass in on kue0 proto tcp from any to any port = ssh modulate state
-@0 pass in on kue0 proto tcp from any to any port = smtp modulate state
-@0 pass in on kue0 proto tcp from any to any port = domain modulate state
-@0 pass in on kue0 proto tcp from any to any port = auth modulate state
+@0 block out log on tun0 all
+@0 block in log on tun0 all
+@0 block return-rst out log on tun0 proto tcp all
+@0 block return-rst in log on tun0 proto tcp all
+@0 block return-icmp out log on tun0 proto udp all
+@0 block return-icmp in log on tun0 proto udp all
+@0 block out log quick on tun0 inet from ! 157.161.48.183/32 to any
+@0 block in quick on tun0 inet from any to 255.255.255.255/32
+@0 block in log quick on tun0 inet from 10.0.0.0/8 to any
+@0 block in log quick on tun0 inet from 172.16.0.0/12 to any
+@0 block in log quick on tun0 inet from 192.168.0.0/16 to any
+@0 block in log quick on tun0 inet from 255.255.255.255/32 to any
+@0 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state
+@0 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state
+@0 pass out on tun0 proto udp all keep state
+@0 pass in on tun0 proto udp from any to any port = domain keep state
+@0 pass out on tun0 proto tcp all modulate state
+@0 pass in on tun0 proto tcp from any to any port = ssh modulate state
+@0 pass in on tun0 proto tcp from any to any port = smtp modulate state
+@0 pass in on tun0 proto tcp from any to any port = domain modulate state
+@0 pass in on tun0 proto tcp from any to any port = auth modulate state
diff --git a/regress/sbin/pfctl/pf8.in b/regress/sbin/pfctl/pf8.in
index fd625c7deaf..44587b6f654 100644
--- a/regress/sbin/pfctl/pf8.in
+++ b/regress/sbin/pfctl/pf8.in
@@ -1,2 +1,2 @@
extern = "{ ! 10.0.0.0/8, 10.1.2.3 }"
-block out log on rl0 from $extern to any
+block out log on tun1 from $extern to any
diff --git a/regress/sbin/pfctl/pf8.ok b/regress/sbin/pfctl/pf8.ok
index e92b48fbf68..7f881dab3bb 100644
--- a/regress/sbin/pfctl/pf8.ok
+++ b/regress/sbin/pfctl/pf8.ok
@@ -1,3 +1,3 @@
extern = { ! 10.0.0.0/8, 10.1.2.3 }
-@0 block out log on rl0 inet from 10.1.2.3/32 to any
-@0 block out log on rl0 inet from ! 10.0.0.0/8 to any
+@0 block out log on tun1 inet from 10.1.2.3/32 to any
+@0 block out log on tun1 inet from ! 10.0.0.0/8 to any
diff --git a/regress/sbin/pfctl/pf9.in b/regress/sbin/pfctl/pf9.in
index 31a939418d7..2468400b7f4 100644
--- a/regress/sbin/pfctl/pf9.in
+++ b/regress/sbin/pfctl/pf9.in
@@ -1,3 +1,3 @@
-interfaces = "{ gm0, kue0 }"
+interfaces = "{ enc0, tun0 }"
block in on $interfaces all
diff --git a/regress/sbin/pfctl/pf9.ok b/regress/sbin/pfctl/pf9.ok
index bad26450dce..8c64f3e3331 100644
--- a/regress/sbin/pfctl/pf9.ok
+++ b/regress/sbin/pfctl/pf9.ok
@@ -1,3 +1,3 @@
-interfaces = { gm0, kue0 }
-@0 block in on kue0 all
-@0 block in on gm0 all
+interfaces = { enc0, tun0 }
+@0 block in on tun0 all
+@0 block in on enc0 all