summaryrefslogtreecommitdiff
path: root/regress/sys
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2017-09-07 19:04:24 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2017-09-07 19:04:24 +0000
commite58a768f13ea703f65242c56b4359f666ad040e9 (patch)
treea57c2ab41298c08dac30bd1c6a20d1768c10bb81 /regress/sys
parent7751fe7ab375cbec4eeedb1f48bf7abf2041dba4 (diff)
Get IPv4 and IPv6 fragment tests into common shape. Some chunks
were forgotten in previous commit.
Diffstat (limited to 'regress/sys')
-rw-r--r--regress/sys/netinet6/frag6/Makefile6
-rw-r--r--regress/sys/netinet6/frag6/frag6_refrag.py2
-rw-r--r--regress/sys/netinet6/frag6/pf.conf2
3 files changed, 5 insertions, 5 deletions
diff --git a/regress/sys/netinet6/frag6/Makefile b/regress/sys/netinet6/frag6/Makefile
index 378fd5f0a57..f382e4a9d41 100644
--- a/regress/sys/netinet6/frag6/Makefile
+++ b/regress/sys/netinet6/frag6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/07 23:15:27 bluhm Exp $
+# $OpenBSD: Makefile,v 1.21 2017/09/07 19:04:23 bluhm Exp $
# The following ports must be installed:
#
@@ -35,8 +35,8 @@ LOCAL_IF ?= em1
LOCAL_MAC ?= 00:1b:21:0e:6e:8e
REMOTE_MAC ?= 00:04:23:b0:68:8e
-LOCAL_ADDR ?= fdd7:e83e:66bc:81::21
-REMOTE_ADDR ?= fdd7:e83e:66bc:81::22
+LOCAL_ADDR6 ?= fdd7:e83e:66bc:81::21
+REMOTE_ADDR6 ?= fdd7:e83e:66bc:81::22
REMOTE_SSH ?=
diff --git a/regress/sys/netinet6/frag6/frag6_refrag.py b/regress/sys/netinet6/frag6/frag6_refrag.py
index 4c95c17f6ca..3ae38b00a2e 100644
--- a/regress/sys/netinet6/frag6/frag6_refrag.py
+++ b/regress/sys/netinet6/frag6/frag6_refrag.py
@@ -57,7 +57,7 @@ for a in ans:
print "reply cksum=%#x" % (reply_cksum)
# change request checksum incrementaly and check with reply
diff_cksum=~(~reply_cksum+~(~request_cksum+~0x8000+0x8100))
- if diff_cksum != -1:
+ if diff_cksum != -1:
print "CHECKSUM ERROR diff cksum=%#x" % (diff_cksum)
exit(1)
exit(0)
diff --git a/regress/sys/netinet6/frag6/pf.conf b/regress/sys/netinet6/frag6/pf.conf
index a3f0ff4a088..fc5dbec04f1 100644
--- a/regress/sys/netinet6/frag6/pf.conf
+++ b/regress/sys/netinet6/frag6/pf.conf
@@ -1,5 +1,5 @@
# pf drops IPv6 options header by default, test combines frag with opt header
-pass allow-opts
+pass inet6 allow-opts
# turning on and off pf via ssh connection does not work with states
pass proto tcp from port ssh no state