summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2021-02-01 12:52:08 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2021-02-01 12:52:08 +0000
commite881131bae8686f016708304a2e5a5ab90cc3a98 (patch)
tree03f4a6467282739f746bd88a9e7f25ab5012fd8d
parentf167e9e478bd671b0d4e2b135aa3331ad63426f1 (diff)
Syntax of pf(4) route-to has changed. Adapt tests.
-rw-r--r--regress/sys/net/pf_forward/Makefile4
-rw-r--r--regress/sys/net/pf_forward/pf.conf32
-rw-r--r--regress/sys/net/pf_fragment/Makefile4
-rw-r--r--regress/sys/net/pf_fragment/pf.conf8
4 files changed, 24 insertions, 24 deletions
diff --git a/regress/sys/net/pf_forward/Makefile b/regress/sys/net/pf_forward/Makefile
index 167a242d44f..3805a0e422a 100644
--- a/regress/sys/net/pf_forward/Makefile
+++ b/regress/sys/net/pf_forward/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.34 2020/12/30 21:40:32 kn Exp $
+# $OpenBSD: Makefile,v 1.35 2021/02/01 12:52:07 bluhm Exp $
-# Copyright (c) 2012-2020 Alexander Bluhm <bluhm@openbsd.org>
+# Copyright (c) 2012-2021 Alexander Bluhm <bluhm@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
diff --git a/regress/sys/net/pf_forward/pf.conf b/regress/sys/net/pf_forward/pf.conf
index 2ad0e50bcbc..0e49a681ce2 100644
--- a/regress/sys/net/pf_forward/pf.conf
+++ b/regress/sys/net/pf_forward/pf.conf
@@ -17,22 +17,22 @@ pass out inet6 tagged af
pass in to $AF_IN6/64 af-to inet from $PF_OUT to $ECO_IN/24 tag af
pass out inet tagged af
-pass in to $RTT_IN/24 route-to $RT_IN@$PF_IFOUT tag rttin
-pass out tagged rttin
-pass in to $RTT_IN6/64 route-to $RT_IN6@$PF_IFOUT tag rttin
-pass out tagged rttin
+pass in to $RTT_IN/24 route-to $RT_IN tag rttin
+pass out tagged rttin
+pass in to $RTT_IN6/64 route-to $RT_IN6 tag rttin
+pass out tagged rttin
-pass in to $RTT_OUT/24 tag rttout
-pass out route-to $RT_IN@$PF_IFOUT tagged rttout
-pass in to $RTT_OUT6/64 tag rttout
-pass out route-to $RT_IN6@$PF_IFOUT tagged rttout
+pass in to $RTT_OUT/24 tag rttout
+pass out route-to $RT_IN tagged rttout
+pass in to $RTT_OUT6/64 tag rttout
+pass out route-to $RT_IN6 tagged rttout
-pass in from $RPT_IN/24 reply-to $SRC_OUT@$PF_IFIN tag rptin
-pass out tagged rptin
-pass in from $RPT_IN6/64 reply-to $SRC_OUT6@$PF_IFIN tag rptin
-pass out tagged rptin
+pass in from $RPT_IN/24 reply-to $SRC_OUT tag rptin
+pass out tagged rptin
+pass in from $RPT_IN6/64 reply-to $SRC_OUT6 tag rptin
+pass out tagged rptin
-pass in from $RPT_OUT/24 tag rptout
-pass out reply-to $SRC_OUT@$PF_IFIN tagged rptout
-pass in from $RPT_OUT6/64 tag rptout
-pass out reply-to $SRC_OUT6@$PF_IFIN tagged rptout
+pass in from $RPT_OUT/24 tag rptout
+pass out reply-to $SRC_OUT tagged rptout
+pass in from $RPT_OUT6/64 tag rptout
+pass out reply-to $SRC_OUT6 tagged rptout
diff --git a/regress/sys/net/pf_fragment/Makefile b/regress/sys/net/pf_fragment/Makefile
index 885a24ba082..7f4e45f9320 100644
--- a/regress/sys/net/pf_fragment/Makefile
+++ b/regress/sys/net/pf_fragment/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.29 2020/12/30 21:40:33 kn Exp $
+# $OpenBSD: Makefile,v 1.30 2021/02/01 12:52:07 bluhm Exp $
-# Copyright (c) 2011-2020 Alexander Bluhm <bluhm@openbsd.org>
+# Copyright (c) 2011-2021 Alexander Bluhm <bluhm@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
diff --git a/regress/sys/net/pf_fragment/pf.conf b/regress/sys/net/pf_fragment/pf.conf
index ca761d20993..e6377956e90 100644
--- a/regress/sys/net/pf_fragment/pf.conf
+++ b/regress/sys/net/pf_fragment/pf.conf
@@ -10,7 +10,7 @@ pass out nat-to $PF_OUT allow-opts tagged rdr
pass in to $RDR_IN6/64 rdr-to $ECO_IN6 allow-opts tag rdr
pass out nat-to $PF_OUT6 allow-opts tagged rdr
-pass in to $RTT_IN/24 allow-opts tag rtt
-pass out route-to $RT_IN@$PF_IFOUT allow-opts tagged rtt
-pass in to $RTT_IN6/64 allow-opts tag rtt
-pass out route-to $RT_IN6@$PF_IFOUT allow-opts tagged rtt
+pass in to $RTT_IN/24 allow-opts tag rtt
+pass out route-to $RT_IN allow-opts tagged rtt
+pass in to $RTT_IN6/64 allow-opts tag rtt
+pass out route-to $RT_IN6 allow-opts tagged rtt