diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-11-21 22:56:35 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-11-21 22:56:35 +0000 |
| commit | 054200204230c78667a40ef62191c66a19423524 (patch) | |
| tree | 611b86d3ffc3e009d4f92610bd73b63008d5a41d /regress/sys/net/pf_state | |
| parent | various cleanup; (diff) | |
| download | wireguard-openbsd-054200204230c78667a40ef62191c66a19423524.tar.xz wireguard-openbsd-054200204230c78667a40ef62191c66a19423524.zip | |
Print better error message if test fails.
Diffstat (limited to 'regress/sys/net/pf_state')
| -rw-r--r-- | regress/sys/net/pf_state/Makefile | 7 | ||||
| -rw-r--r-- | regress/sys/net/pf_state/challenge_ack.py | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/regress/sys/net/pf_state/Makefile b/regress/sys/net/pf_state/Makefile index 1e36cf5cbf0..00ce57ad083 100644 --- a/regress/sys/net/pf_state/Makefile +++ b/regress/sys/net/pf_state/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/11/09 12:43:36 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2016/11/21 22:56:35 bluhm Exp $ # The following ports must be installed: # @@ -105,8 +105,9 @@ check-setup-local: ping -n -c 1 ${REMOTE_ADDR} # REMOTE_ADDR route -n get -inet ${REMOTE_ADDR} | fgrep -q 'interface: ${LOCAL_IF}' # REMOTE_ADDR LOCAL_IF ! ping -n -c 1 -w 1 ${FAKE_NET_ADDR} # FAKE_NET_ADDR - route -n get -inet ${FAKE_NET_ADDR} | grep -q 'flags: .*BLACKHOLE' # FAKE_NET_ADDR - route -n get -inet -net ${FAKE_NET} | grep -q 'flags: .*BLACKHOLE' # FAKE_NET +.for ip in FAKE_NET FAKE_NET_ADDR + route -n get -inet ${${ip}} | grep -q 'flags: .*BLACKHOLE' # ${ip} +.endfor check-setup-remote: @echo '\n======== $@ ========' diff --git a/regress/sys/net/pf_state/challenge_ack.py b/regress/sys/net/pf_state/challenge_ack.py index 322385fb23f..774765450c4 100644 --- a/regress/sys/net/pf_state/challenge_ack.py +++ b/regress/sys/net/pf_state/challenge_ack.py @@ -29,11 +29,15 @@ ip=IP(src=FAKE_NET_ADDR, dst=REMOTE_ADDR) print "Send SYN packet, receive SYN+ACK" syn=TCP(sport=fake_port, dport='echo', seq=1, flags='S', window=(2**16)-1) -synack=sr1(ip/syn, iface=LOCAL_IF, timeout=5) +syn_ack=sr1(ip/syn, iface=LOCAL_IF, timeout=5) + +if syn_ack is None: + print "ERROR: no matching SYN+ACK packet received" + exit(1) print "Send ACK packet to finish handshake." -ack=TCP(sport=synack.dport, dport=synack.sport, seq=2, flags='A', - ack=synack.seq+1) +ack=TCP(sport=syn_ack.dport, dport=syn_ack.sport, seq=2, flags='A', + ack=syn_ack.seq+1) send(ip/ack, iface=LOCAL_IF) print "Connection is established, send bogus SYN, expect challenge ACK" @@ -52,9 +56,9 @@ if challenge_ack is None: print "ERROR: no matching ACK packet received" exit(1) -if challenge_ack.getlayer(TCP).seq != (synack.seq + 1): +if challenge_ack.getlayer(TCP).seq != (syn_ack.seq + 1): print "ERROR: expecting seq %d got %d in challange ack" % \ - (challenge_ack.getlayer(TCP).seq, (synack.seq + 1)) + (challenge_ack.getlayer(TCP).seq, (syn_ack.seq + 1)) exit(1) exit(0) |