Module Name: src
Committed By: ozaki-r
Date: Thu Nov 24 08:52:20 UTC 2016
Modified Files:
src/tests/net/arp: Makefile t_arp.sh t_dad.sh
src/tests/net/ndp: Makefile t_dad.sh t_ndp.sh
src/tests/net/net: Makefile t_mtudisc.sh t_mtudisc6.sh t_ping6_opts.sh
Added Files:
src/tests/net: net_common.sh
Log Message:
Reduce duplicate codes
Introduce net_common.sh that is to share common functions used in tests
for networking. This commit commonizes extract_new_packets. Other duplicate
codes will be moved to the file in further commits.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/net/net_common.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/arp/Makefile
cvs rdiff -u -r1.18 -r1.19 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/net/arp/t_dad.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/net/ndp/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/net/ndp/t_dad.sh
cvs rdiff -u -r1.14 -r1.15 src/tests/net/ndp/t_ndp.sh
cvs rdiff -u -r1.18 -r1.19 src/tests/net/net/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/net/net/t_mtudisc.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/net/t_mtudisc6.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/net/t_ping6_opts.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/arp/Makefile
diff -u src/tests/net/arp/Makefile:1.3 src/tests/net/arp/Makefile:1.4
--- src/tests/net/arp/Makefile:1.3 Thu Jul 30 05:43:42 2015
+++ src/tests/net/arp/Makefile Thu Nov 24 08:52:19 2016
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2015/07/30 05:43:42 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.4 2016/11/24 08:52:19 ozaki-r Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/arp
-TESTS_SH= t_arp
-TESTS_SH+= t_dad
+.for name in arp dad
+TESTS_SH+= t_${name}
+TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
+.endfor
.include <bsd.test.mk>
Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.18 src/tests/net/arp/t_arp.sh:1.19
--- src/tests/net/arp/t_arp.sh:1.18 Mon Nov 7 05:25:36 2016
+++ src/tests/net/arp/t_arp.sh Thu Nov 24 08:52:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.18 2016/11/07 05:25:36 ozaki-r Exp $
+# $NetBSD: t_arp.sh,v 1.19 2016/11/24 08:52:19 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -363,21 +363,6 @@ make_pkt_str_garp()
echo $pkt
}
-extract_new_packets()
-{
- local old=./old
-
- if [ ! -f $old ]; then
- old=/dev/null
- fi
-
- shmif_dumpbus -p - bus1 2>/dev/null| \
- tcpdump -n -e -r - 2>/dev/null > ./new
- diff -u $old ./new |grep '^+' |cut -d '+' -f 2 > ./diff
- mv -f ./new ./old
- cat ./diff
-}
-
test_proxy_arp()
{
local arp_keep=5
@@ -416,7 +401,7 @@ test_proxy_arp()
rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP1
# Flushing
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
# Set up proxy ARP entry
export RUMP_SERVER=$SOCKDST
@@ -435,7 +420,7 @@ test_proxy_arp()
rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP1
fi
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
pkt1=$(make_pkt_str_arprep $IP4DST_PROXYARP1 $macaddr_dst)
@@ -461,7 +446,7 @@ test_proxy_arp()
atf_check -s not-exit:0 -o ignore -e ignore \
rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP2
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
# ARP reply should be sent
@@ -502,7 +487,7 @@ arp_link_activation_body()
setup_src_server $arp_keep
# flush old packets
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
export RUMP_SERVER=$SOCKSRC
@@ -510,7 +495,7 @@ arp_link_activation_body()
b2:a1:00:00:00:01
atf_check -s exit:0 sleep 1
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
pkt=$(make_pkt_str_arpreq $IP4SRC $IP4SRC)
@@ -520,7 +505,7 @@ arp_link_activation_body()
b2:a1:00:00:00:02 active
atf_check -s exit:0 sleep 1
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
pkt=$(make_pkt_str_arpreq $IP4SRC $IP4SRC)
Index: src/tests/net/arp/t_dad.sh
diff -u src/tests/net/arp/t_dad.sh:1.9 src/tests/net/arp/t_dad.sh:1.10
--- src/tests/net/arp/t_dad.sh:1.9 Mon Nov 7 05:25:36 2016
+++ src/tests/net/arp/t_dad.sh Thu Nov 24 08:52:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_dad.sh,v 1.9 2016/11/07 05:25:36 ozaki-r Exp $
+# $NetBSD: t_dad.sh,v 1.10 2016/11/24 08:52:19 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -74,21 +74,6 @@ make_pkt_str()
echo $pkt
}
-extract_new_packets()
-{
- local old=./old
-
- if [ ! -f $old ]; then
- old=/dev/null
- fi
-
- shmif_dumpbus -p - bus1 2>/dev/null| \
- tcpdump -n -e -r - 2>/dev/null > ./new
- diff -u $old ./new |grep '^+' |cut -d '+' -f 2 > ./diff
- mv -f ./new ./old
- cat ./diff
-}
-
dad_basic_body()
{
local pkt=
Index: src/tests/net/ndp/Makefile
diff -u src/tests/net/ndp/Makefile:1.2 src/tests/net/ndp/Makefile:1.3
--- src/tests/net/ndp/Makefile:1.2 Wed Nov 11 07:52:57 2015
+++ src/tests/net/ndp/Makefile Thu Nov 24 08:52:20 2016
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2015/11/11 07:52:57 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.3 2016/11/24 08:52:20 ozaki-r Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/ndp
-TESTS_SH= t_dad
-TESTS_SH+= t_ndp
-TESTS_SH+= t_ra
+.for name in dad ndp ra
+TESTS_SH+= t_${name}
+TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
+.endfor
.include <bsd.test.mk>
Index: src/tests/net/ndp/t_dad.sh
diff -u src/tests/net/ndp/t_dad.sh:1.9 src/tests/net/ndp/t_dad.sh:1.10
--- src/tests/net/ndp/t_dad.sh:1.9 Mon Nov 7 05:25:37 2016
+++ src/tests/net/ndp/t_dad.sh Thu Nov 24 08:52:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_dad.sh,v 1.9 2016/11/07 05:25:37 ozaki-r Exp $
+# $NetBSD: t_dad.sh,v 1.10 2016/11/24 08:52:20 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -85,21 +85,6 @@ make_ns_pkt_str()
echo $pkt
}
-extract_new_packets()
-{
- local old=./old
-
- if [ ! -f $old ]; then
- old=/dev/null
- fi
-
- shmif_dumpbus -p - bus1 2>/dev/null| \
- tcpdump -n -e -r - 2>/dev/null > ./new
- diff -u $old ./new |grep '^+' |cut -d '+' -f 2 > ./diff
- mv -f ./new ./old
- cat ./diff
-}
-
dad_basic_body()
{
local pkt=
@@ -127,7 +112,7 @@ dad_basic_body()
#atf_check -s exit:0 -x "cat ./out |grep $localip2 |grep -q tentative"
atf_check -s exit:0 sleep 2
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
# Check DAD probe packets (Neighbor Solicitation Message)
@@ -139,7 +124,7 @@ dad_basic_body()
# Waiting for DAD complete
atf_check -s exit:0 rump.ifconfig -w 10
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
# IPv6 DAD doesn't announce (Neighbor Advertisement Message)
@@ -158,14 +143,14 @@ dad_basic_body()
# Check DAD probe packets (Neighbor Solicitation Message)
atf_check -s exit:0 sleep 2
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
pkt=$(make_ns_pkt_str 3 $localip3)
atf_check -s exit:0 -x "cat ./out |grep -q '$pkt'"
# Waiting for DAD complete
atf_check -s exit:0 rump.ifconfig -w 10
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
# IPv6 DAD doesn't announce (Neighbor Advertisement Message)
@@ -229,7 +214,7 @@ dad_count_test()
# Check the number of DAD probe packets (Neighbor Solicitation Message)
atf_check -s exit:0 sleep 2
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
pkt=$(make_ns_pkt_str $id $target)
atf_check -s exit:0 -o match:"$count" \
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.14 src/tests/net/ndp/t_ndp.sh:1.15
--- src/tests/net/ndp/t_ndp.sh:1.14 Mon Nov 7 05:25:37 2016
+++ src/tests/net/ndp/t_ndp.sh Thu Nov 24 08:52:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ndp.sh,v 1.14 2016/11/07 05:25:37 ozaki-r Exp $
+# $NetBSD: t_ndp.sh,v 1.15 2016/11/24 08:52:20 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -324,21 +324,6 @@ make_pkt_str_na()
echo $pkt
}
-extract_new_packets()
-{
- local old=./old
-
- if [ ! -f $old ]; then
- old=/dev/null
- fi
-
- shmif_dumpbus -p - bus1 2>/dev/null| \
- tcpdump -n -e -r - 2>/dev/null > ./new
- diff -u $old ./new |grep '^+' |cut -d '+' -f 2 > ./diff
- mv -f ./new ./old
- cat ./diff
-}
-
ndp_link_activation_body()
{
local linklocal=
@@ -350,7 +335,7 @@ ndp_link_activation_body()
setup_src_server
# flush old packets
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
export RUMP_SERVER=$SOCKSRC
@@ -358,7 +343,7 @@ ndp_link_activation_body()
b2:a1:00:00:00:01
atf_check -s exit:0 sleep 1
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
linklocal=$(rump.ifconfig shmif0 |awk '/fe80/ {print $2;}' |awk -F % '{print $1;}')
@@ -371,7 +356,7 @@ ndp_link_activation_body()
b2:a1:00:00:00:02 active
atf_check -s exit:0 sleep 1
- extract_new_packets > ./out
+ extract_new_packets bus1 > ./out
$DEBUG && cat ./out
linklocal=$(rump.ifconfig shmif0 |awk '/fe80/ {print $2;}' |awk -F % '{print $1;}')
Index: src/tests/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.18 src/tests/net/net/Makefile:1.19
--- src/tests/net/net/Makefile:1.18 Mon Nov 7 00:54:48 2016
+++ src/tests/net/net/Makefile Thu Nov 24 08:52:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/11/07 00:54:48 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.19 2016/11/24 08:52:20 ozaki-r Exp $
#
.include <bsd.own.mk>
@@ -11,13 +11,12 @@ TESTS_C+= t_udp
TESTS_C+= t_pktinfo
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_C+= t_raw
-TESTS_SH= t_forwarding
-TESTS_SH+= t_ipaddress
-TESTS_SH+= t_ipv6address
-TESTS_SH+= t_ipv6_lifetime
-TESTS_SH+= t_mtudisc
-TESTS_SH+= t_mtudisc6
-TESTS_SH+= t_ping6_opts
+
+.for name in forwarding ipaddress ipv6address ipv6_lifetime mtudisc mtudisc6 \
+ ping6_opts
+TESTS_SH+= t_${name}
+TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
+.endfor
.endif
LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net -lrumpdev
Index: src/tests/net/net/t_mtudisc.sh
diff -u src/tests/net/net/t_mtudisc.sh:1.3 src/tests/net/net/t_mtudisc.sh:1.4
--- src/tests/net/net/t_mtudisc.sh:1.3 Mon Nov 7 05:25:37 2016
+++ src/tests/net/net/t_mtudisc.sh Thu Nov 24 08:52:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtudisc.sh,v 1.3 2016/11/07 05:25:37 ozaki-r Exp $
+# $NetBSD: t_mtudisc.sh,v 1.4 2016/11/24 08:52:20 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -64,22 +64,6 @@ setup_server()
$DEBUG && rump.ifconfig $if
}
-extract_new_packets()
-{
- local bus=$1
- local old=./old
-
- if [ ! -f $old ]; then
- old=/dev/null
- fi
-
- shmif_dumpbus -p - $bus 2>/dev/null| \
- tcpdump -n -e -r - 2>/dev/null > ./new
- diff -u $old ./new |grep '^+' |cut -d '+' -f 2 > ./diff
- mv -f ./new ./old
- cat ./diff
-}
-
setup_httpd()
{
local sock=$1
Index: src/tests/net/net/t_mtudisc6.sh
diff -u src/tests/net/net/t_mtudisc6.sh:1.1 src/tests/net/net/t_mtudisc6.sh:1.2
--- src/tests/net/net/t_mtudisc6.sh:1.1 Mon Nov 7 00:54:48 2016
+++ src/tests/net/net/t_mtudisc6.sh Thu Nov 24 08:52:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtudisc6.sh,v 1.1 2016/11/07 00:54:48 ozaki-r Exp $
+# $NetBSD: t_mtudisc6.sh,v 1.2 2016/11/24 08:52:20 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -65,22 +65,6 @@ setup_server()
$DEBUG && rump.ifconfig $if
}
-extract_new_packets()
-{
- local bus=$1
- local old=./old
-
- if [ ! -f $old ]; then
- old=/dev/null
- fi
-
- shmif_dumpbus -p - $bus 2>/dev/null| \
- tcpdump -n -e -r - 2>/dev/null > ./new
- diff -u $old ./new |grep '^+' |cut -d '+' -f 2 > ./diff
- mv -f ./new ./old
- cat ./diff
-}
-
setup_httpd()
{
local sock=$1
Index: src/tests/net/net/t_ping6_opts.sh
diff -u src/tests/net/net/t_ping6_opts.sh:1.4 src/tests/net/net/t_ping6_opts.sh:1.5
--- src/tests/net/net/t_ping6_opts.sh:1.4 Mon Nov 7 05:44:48 2016
+++ src/tests/net/net/t_ping6_opts.sh Thu Nov 24 08:52:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ping6_opts.sh,v 1.4 2016/11/07 05:44:48 ozaki-r Exp $
+# $NetBSD: t_ping6_opts.sh,v 1.5 2016/11/24 08:52:20 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -109,22 +109,6 @@ setup6()
setup_forwarder
}
-extract_new_packets()
-{
- local bus=$1
- local old=./old
-
- if [ ! -f $old ]; then
- old=/dev/null
- fi
-
- shmif_dumpbus -p - $bus 2>/dev/null| \
- tcpdump -n -e -r - 2>/dev/null > ./new
- diff -u $old ./new |grep '^+' |cut -d '+' -f 2 > ./diff
- mv -f ./new ./old
- cat ./diff
-}
-
get_lladdr()
{
Added files:
Index: src/tests/net/net_common.sh
diff -u /dev/null src/tests/net/net_common.sh:1.1
--- /dev/null Thu Nov 24 08:52:20 2016
+++ src/tests/net/net_common.sh Thu Nov 24 08:52:19 2016
@@ -0,0 +1,47 @@
+# $NetBSD: net_common.sh,v 1.1 2016/11/24 08:52:19 ozaki-r Exp $
+#
+# Copyright (c) 2016 Internet Initiative Japan Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# Common utility functions for tests/net
+#
+
+extract_new_packets()
+{
+ local bus=$1
+ local old=./.__old
+
+ if [ ! -f $old ]; then
+ old=/dev/null
+ fi
+
+ shmif_dumpbus -p - $bus 2>/dev/null| \
+ tcpdump -n -e -r - 2>/dev/null > ./.__new
+ diff -u $old ./.__new |grep '^+' |cut -d '+' -f 2 > ./.__diff
+ mv -f ./.__new ./.__old
+ cat ./.__diff
+}
+
