Module Name: src
Committed By: ozaki-r
Date: Fri Feb 9 03:53:07 UTC 2018
Modified Files:
src/tests/net/net: t_ping_opts.sh
Log Message:
Fix ping_opts_gateway and ping_opts_recordroute
We need to enable the options of source routing on all rump kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/net/t_ping_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/net/t_ping_opts.sh
diff -u src/tests/net/net/t_ping_opts.sh:1.2 src/tests/net/net/t_ping_opts.sh:1.3
--- src/tests/net/net/t_ping_opts.sh:1.2 Thu Feb 8 09:56:19 2018
+++ src/tests/net/net/t_ping_opts.sh Fri Feb 9 03:53:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_ping_opts.sh,v 1.2 2018/02/08 09:56:19 maxv Exp $
+# $NetBSD: t_ping_opts.sh,v 1.3 2018/02/09 03:53:07 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -206,9 +206,6 @@ ping_opts_gateway_body()
my_macaddr=$(get_macaddr ${SOCKSRC} shmif0)
gw_shmif0_macaddr=$(get_macaddr ${SOCKFWD} shmif0)
- atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=1
- atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwsrcrt=1
-
export RUMP_SERVER=$SOCKSRC
atf_check -s exit:0 -o ignore rump.ping $PING_OPTS $IPDST
check_echo_request_pkt_with_macaddr \
@@ -225,6 +222,22 @@ ping_opts_gateway_body()
check_echo_request_pkt_with_macaddr \
$my_macaddr $gw_shmif0_macaddr $IPSRC $IPDST
+ export RUMP_SERVER=$SOCKSRC
+ # ping -g <gateway>
+ # By default source-routed packets are prohibited
+ atf_check -s not-exit:0 -o match:'Net prohibited access' \
+ rump.ping $PING_OPTS -g $IPSRCGW $IPDST
+
+ # Enable the options of source routing
+ export RUMP_SERVER=$SOCKSRC
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=1
+ export RUMP_SERVER=$SOCKDST
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=1
+ export RUMP_SERVER=$SOCKFWD
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=1
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwsrcrt=1
+
+ export RUMP_SERVER=$SOCKSRC
# ping -g <gateway>
atf_check -s exit:0 -o ignore rump.ping $PING_OPTS \
-g $IPSRCGW $IPDST
@@ -238,9 +251,6 @@ ping_opts_gateway_body()
check_echo_request_pkt_with_macaddr \
$my_macaddr $gw_shmif2_macaddr $IPSRC $IPSRCGW2
- atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=0
- atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwsrcrt=0
-
rump_server_destroy_ifaces
}
@@ -308,6 +318,16 @@ ping_opts_recordroute_body()
$my_macaddr $gw_shmif0_macaddr $IPSRC $IPDST
check_recorded_routes $out
+ # Enable the options of source routing
+ export RUMP_SERVER=$SOCKSRC
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=1
+ export RUMP_SERVER=$SOCKDST
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=1
+ export RUMP_SERVER=$SOCKFWD
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.allowsrcrt=1
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwsrcrt=1
+
+ export RUMP_SERVER=$SOCKSRC
# ping -R -g <gateway>
atf_check -s exit:0 -o save:$out rump.ping $PING_OPTS \
-R -g $IPSRCGW $IPDST
