Module Name: src
Committed By: kre
Date: Sat Oct 1 20:18:06 UTC 2016
Modified Files:
src/tests/net/if_tun: t_tun.sh
Log Message:
Compensate for the new world order of ifconfig output format,
and the new default netmask for point to point links.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/if_tun/t_tun.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/if_tun/t_tun.sh
diff -u src/tests/net/if_tun/t_tun.sh:1.2 src/tests/net/if_tun/t_tun.sh:1.3
--- src/tests/net/if_tun/t_tun.sh:1.2 Mon Sep 5 04:35:46 2016
+++ src/tests/net/if_tun/t_tun.sh Sat Oct 1 20:18:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_tun.sh,v 1.2 2016/09/05 04:35:46 ozaki-r Exp $
+# $NetBSD: t_tun.sh,v 1.3 2016/10/01 20:18:06 kre Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -110,8 +110,7 @@ tun_setup_body()
atf_check -s exit:0 rump.ifconfig tun0 create
atf_check -s exit:0 rump.ifconfig tun0 ${IP_LOCAL} ${IP_REMOTE} up
atf_check -s exit:0 \
- -o match:"inet ${IP_LOCAL} -> ${IP_REMOTE} netmask 0xff000000" \
- rump.ifconfig tun0
+ -o match:"inet ${IP_LOCAL}/32 -> ${IP_REMOTE}" rump.ifconfig tun0
$DEBUG && rump.netstat -nr -f inet
check_route_entry ${IP_REMOTE} ${IP_LOCAL} UH tun0
@@ -119,8 +118,7 @@ tun_setup_body()
atf_check -s exit:0 rump.ifconfig tun0 create
atf_check -s exit:0 rump.ifconfig tun0 ${IP_REMOTE} ${IP_LOCAL} up
atf_check -s exit:0 \
- -o match:"inet ${IP_REMOTE} -> ${IP_LOCAL} netmask 0xff000000" \
- rump.ifconfig tun0
+ -o match:"inet ${IP_REMOTE}/32 -> ${IP_LOCAL}" rump.ifconfig tun0
$DEBUG && rump.netstat -nr -f inet
check_route_entry ${IP_LOCAL} ${IP_REMOTE} UH tun0
}
