Module Name: src
Committed By: rin
Date: Tue Aug 22 05:40:50 UTC 2023
Modified Files:
src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh
Log Message:
t_ipsec_{gif,l2tp}: Adjust for tcpdump 4.99.4
It does not longer output redundant `` (ipip-proto-4)'':
https://github.com/the-tcpdump-group/tcpdump/commit/cba9b77a98e9dde764abde71a899ee8937ca56e8
Now, these tests become passing again.
Thanks mlelstv@ for finding out upstream commit.
OK ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/ipsec/t_ipsec_gif.sh
diff -u src/tests/net/ipsec/t_ipsec_gif.sh:1.9 src/tests/net/ipsec/t_ipsec_gif.sh:1.10
--- src/tests/net/ipsec/t_ipsec_gif.sh:1.9 Mon Feb 17 08:46:10 2020
+++ src/tests/net/ipsec/t_ipsec_gif.sh Tue Aug 22 05:40:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_gif.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
+# $NetBSD: t_ipsec_gif.sh,v 1.10 2023/08/22 05:40:50 rin Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -49,11 +49,7 @@ make_gif_pktstr()
proto_cap=ESP
else
proto_cap=AH
- if [ $ipproto = ipv4 ]; then
- inner_str="$src_inner > $dst_inner:.+\(ipip-proto-4\)"
- else
- inner_str="$src_inner > $dst_inner"
- fi
+ inner_str="$src_inner > $dst_inner"
fi
echo "$src > $dst: $proto_cap.+$inner_str"
@@ -144,11 +140,9 @@ test_ipsec4_gif()
extract_new_packets $BUS_TUNNEL > $outfile
str="$ip_gwlo_tun > $ip_gwre_tun:"
str="$str $ip_local > $ip_remote: ICMP echo request,"
- str="$str .+ \(ipip-proto-4\)"
atf_check -s exit:0 -o match:"$str" cat $outfile
str="$ip_gwre_tun > $ip_gwlo_tun:"
str="$str $ip_remote > $ip_local: ICMP echo reply,"
- str="$str .+ \(ipip-proto-4\)"
atf_check -s exit:0 -o match:"$str" cat $outfile
if [ $mode = tunnel ]; then
Index: src/tests/net/ipsec/t_ipsec_l2tp.sh
diff -u src/tests/net/ipsec/t_ipsec_l2tp.sh:1.9 src/tests/net/ipsec/t_ipsec_l2tp.sh:1.10
--- src/tests/net/ipsec/t_ipsec_l2tp.sh:1.9 Mon Feb 17 08:46:10 2020
+++ src/tests/net/ipsec/t_ipsec_l2tp.sh Tue Aug 22 05:40:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_l2tp.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
+# $NetBSD: t_ipsec_l2tp.sh,v 1.10 2023/08/22 05:40:50 rin Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -49,11 +49,7 @@ make_l2tp_pktstr()
else
proto_cap=AH
if [ $ipproto = ipv4 ]; then
- if [ $mode = tunnel ]; then
- proto_str="ip-proto-115 102 \(ipip-proto-4\)"
- else
- proto_str="ip-proto-115 102"
- fi
+ proto_str="ip-proto-115 102"
else
proto_str="ip-proto-115"
fi
