diff options
Diffstat (limited to 'contrib/netbsd-tests/ipf')
-rw-r--r-- | contrib/netbsd-tests/ipf/expected/n14 | 6 | ||||
-rw-r--r-- | contrib/netbsd-tests/ipf/expected/n14_6 | 6 | ||||
-rwxr-xr-x | contrib/netbsd-tests/ipf/t_filter_parse.sh | 3 | ||||
-rwxr-xr-x | contrib/netbsd-tests/ipf/t_nat_exec.sh | 6 |
4 files changed, 11 insertions, 10 deletions
diff --git a/contrib/netbsd-tests/ipf/expected/n14 b/contrib/netbsd-tests/ipf/expected/n14 index 7b1a19e..14e1401 100644 --- a/contrib/netbsd-tests/ipf/expected/n14 +++ b/contrib/netbsd-tests/ipf/expected/n14 @@ -11,9 +11,9 @@ RDR 10.1.1.253 80 <- -> 203.1.1.1 80 [10.2.2.6 2000] RDR 10.1.1.254 80 <- -> 203.1.1.1 80 [10.2.2.5 2000] Hostmap table: -10.2.2.7,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) -10.2.2.6,203.1.1.1 -> 253.1.1.10,0.0.0.0 (use = 1) -10.2.2.5,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) +10.2.2.7,203.1.1.1 -> 10.1.1.254,0.0.0.0 (use = 1) +10.2.2.6,203.1.1.1 -> 10.1.1.253,0.0.0.0 (use = 1) +10.2.2.5,203.1.1.1 -> 10.1.1.254,0.0.0.0 (use = 1) List of active state sessions: List of configured pools List of configured hash tables diff --git a/contrib/netbsd-tests/ipf/expected/n14_6 b/contrib/netbsd-tests/ipf/expected/n14_6 index b999ee97..c177b62 100644 --- a/contrib/netbsd-tests/ipf/expected/n14_6 +++ b/contrib/netbsd-tests/ipf/expected/n14_6 @@ -11,9 +11,9 @@ RDR 10:1:1::253 80 <- -> 203:0:1::1:1 80 [10::2:2:6 2000] RDR 10:1:1::254 80 <- -> 203:0:1::1:1 80 [10::2:2:5 2000] Hostmap table: -10::2:2:7,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 1) -10::2:2:6,203:0:1:0:0:0:1:1 -> 253:0:1:0:0:0:1:10,any (use = 1) -10::2:2:5,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 3) +10::2:2:7,203:0:1:0:0:0:1:1 -> 10:1:1::254,any (use = 1) +10::2:2:6,203:0:1:0:0:0:1:1 -> 10:0:1:0:0:0:1:253,any (use = 1) +10::2:2:5,203:0:1:0:0:0:1:1 -> 10:1:1::254,any (use = 3) List of active state sessions: List of configured pools List of configured hash tables diff --git a/contrib/netbsd-tests/ipf/t_filter_parse.sh b/contrib/netbsd-tests/ipf/t_filter_parse.sh index f44db7d..a253088 100755 --- a/contrib/netbsd-tests/ipf/t_filter_parse.sh +++ b/contrib/netbsd-tests/ipf/t_filter_parse.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.11 2014/06/29 09:27:58 darrenr Exp $ +# $NetBSD: t_filter_parse.sh,v 1.12 2014/12/06 19:31:25 dholland Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -133,3 +133,4 @@ atf_init_test_cases() atf_add_test_case i22 atf_add_test_case i23 } + diff --git a/contrib/netbsd-tests/ipf/t_nat_exec.sh b/contrib/netbsd-tests/ipf/t_nat_exec.sh index 78110dc..ad99a84 100755 --- a/contrib/netbsd-tests/ipf/t_nat_exec.sh +++ b/contrib/netbsd-tests/ipf/t_nat_exec.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.20 2014/07/15 20:00:23 martin Exp $ +# $NetBSD: t_nat_exec.sh,v 1.22 2015/12/26 08:01:58 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -71,9 +71,9 @@ test_case n8 nattest hex hex -T update_ipid=0 test_case n9 nattest hex hex -T update_ipid=0 test_case n10 nattest hex hex -T update_ipid=0 test_case n11 nattest text text -failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v +test_case n12 nattest hex hex -T update_ipid=0 test_case n13 nattest text text -failing_test_case_be n14 nattest "See PR kern/47665" text text +test_case n14 nattest text text test_case n15 nattest text text -T update_ipid=0 test_case n16 nattest hex hex -D test_case n17 nattest hex hex -D |