Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move HIJACKING definition to net_common.sh

This commit is contained in:
ozaki-r 2016-11-24 09:03:53 +00:00
parent d64bc47ffa
commit 5a2201ed49
12 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/net/arp/t_arp.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_arp.sh,v 1.19 2016/11/24 08:52:19 ozaki-r Exp $
# $NetBSD: t_arp.sh,v 1.20 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@ -27,7 +27,6 @@
inetlib="-lrumpnet_shmif -lrumpnet_tap -lrumpnet -lrumpnet_net -lrumpnet_netinet"
inetserver="rump_server $inetlib -lrumpdev"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCKSRC=unix://commsock1
SOCKDST=unix://commsock2

3
tests/net/arp/t_dad.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_dad.sh,v 1.10 2016/11/24 08:52:19 ozaki-r Exp $
# $NetBSD: t_dad.sh,v 1.11 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@ -27,7 +27,6 @@
inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
inetserver="${inetserver} -lrumpdev"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCKLOCAL=unix://commsock1
SOCKPEER=unix://commsock2

7
tests/net/if_gif/Makefile
View File

@ -1,10 +1,13 @@
# $NetBSD: Makefile,v 1.1 2015/11/05 00:02:59 knakahara Exp $
# $NetBSD: Makefile,v 1.2 2016/11/24 09:03:53 ozaki-r Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/if_gif
TESTS_SH= t_gif
.for name in gif
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
.endfor
.include <bsd.test.mk>

3
tests/net/if_gif/t_gif.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_gif.sh,v 1.6 2016/10/18 04:10:24 ozaki-r Exp $
# $NetBSD: t_gif.sh,v 1.7 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@ -27,7 +27,6 @@
server="rump_server -v -lrumpdev -lrumpnet -lrumpnet_net -lrumpnet_netinet \
-lrumpnet_netinet6 -lrumpnet_shmif -lrumpnet_gif"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCK1=unix://commsock1 # for ROUTER1
SOCK2=unix://commsock2 # for ROUTER2

7
tests/net/if_pppoe/Makefile
View File

@ -1,10 +1,13 @@
# $NetBSD: Makefile,v 1.2 2016/11/24 07:31:14 ozaki-r Exp $
# $NetBSD: Makefile,v 1.3 2016/11/24 09:03:53 ozaki-r Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/if_pppoe
TESTS_SH= t_pppoe
.for name in pppoe
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
.endfor
.include <bsd.test.mk>

3
tests/net/if_pppoe/t_pppoe.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_pppoe.sh,v 1.11 2016/11/10 10:32:59 knakahara Exp $
# $NetBSD: t_pppoe.sh,v 1.12 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@ -28,6 +28,7 @@
server="rump_server -lrump -lrumpnet -lrumpnet_net -lrumpnet_netinet \
-lrumpnet_netinet6 -lrumpnet_shmif -lrumpdev \
-lrumpnet_pppoe"
# pppoectl doesn't work with RUMPHIJACK=sysctl=yes
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so"
SERVER=unix://commsock1

3
tests/net/if_tap/t_tap.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_tap.sh,v 1.4 2016/11/07 05:25:37 ozaki-r Exp $
# $NetBSD: t_tap.sh,v 1.5 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@ -27,7 +27,6 @@
RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6"
RUMP_FLAGS="$RUMP_FLAGS -lrumpnet_shmif -lrumpnet_tap -lrumpnet_bridge -lrumpdev"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCK_LOCAL=unix://commsock1
SOCK_REMOTE=unix://commsock2

3
tests/net/ndp/t_dad.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_dad.sh,v 1.10 2016/11/24 08:52:20 ozaki-r Exp $
# $NetBSD: t_dad.sh,v 1.11 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@ -28,7 +28,6 @@
inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
inetserver="$inetserver -lrumpdev"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCKLOCAL=unix://commsock1
SOCKPEER=unix://commsock2

3
tests/net/ndp/t_ndp.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_ndp.sh,v 1.15 2016/11/24 08:52:20 ozaki-r Exp $
# $NetBSD: t_ndp.sh,v 1.16 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@ -28,7 +28,6 @@
inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
inetserver="$inetserver -lrumpdev"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCKSRC=unix://commsock1
SOCKDST=unix://commsock2

3
tests/net/net/t_mtudisc.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_mtudisc.sh,v 1.4 2016/11/24 08:52:20 ozaki-r Exp $
# $NetBSD: t_mtudisc.sh,v 1.5 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@ -28,7 +28,6 @@
inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
inetserver="$inetserver -lrumpdev"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCKLOCAL=unix://commsock1
SOCKGATEWAY=unix://commsock2

3
tests/net/net/t_mtudisc6.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: t_mtudisc6.sh,v 1.2 2016/11/24 08:52:20 ozaki-r Exp $
# $NetBSD: t_mtudisc6.sh,v 1.3 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@ -28,7 +28,6 @@
inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
inetserver="$inetserver -lrumpdev"
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
SOCKLOCAL=unix://commsock1
SOCKGATEWAY=unix://commsock2

4
tests/net/net_common.sh
View File

@ -1,4 +1,4 @@
# $NetBSD: net_common.sh,v 1.1 2016/11/24 08:52:19 ozaki-r Exp $
# $NetBSD: net_common.sh,v 1.2 2016/11/24 09:03:53 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@ -29,6 +29,8 @@
# Common utility functions for tests/net
#
HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
extract_new_packets()
{
local bus=$1