chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stest: Don't prefix ./ with another ./, in socktmp
[secnet.git]
/
stest
/
common.tcl
diff --git
a/stest/common.tcl
b/stest/common.tcl
index 21ed960138f1b9a99cb98e388d6eba2cc2d20c63..e368f117647b3de901adf24d3f708e9e97c8bbab 100644
(file)
--- a/
stest/common.tcl
+++ b/
stest/common.tcl
@@
-25,22
+25,23
@@
set extra(inside) {
}
set extra(outside) {}
}
set extra(outside) {}
-proc mkconf {
which
} {
+proc mkconf {
location site
} {
global tmp
global builddir
global netlink
global ports
global extra
global netlinkfh
global tmp
global builddir
global netlink
global ports
global extra
global netlinkfh
- set pipefp $tmp/$
which
.netlink
+ set pipefp $tmp/$
site
.netlink
foreach tr {t r} {
file delete $pipefp.$tr
exec mkfifo -m600 $pipefp.$tr
foreach tr {t r} {
file delete $pipefp.$tr
exec mkfifo -m600 $pipefp.$tr
- set netlinkfh($
which
.$tr) [set fh [open $pipefp.$tr r+]]
+ set netlinkfh($
site
.$tr) [set fh [open $pipefp.$tr r+]]
fconfigure $fh -blocking 0 -buffering none -translation binary
}
fconfigure $fh -blocking 0 -buffering none -translation binary
}
- fileevent $netlinkfh($which.r) readable [list netlink-readable $which]
- set fakeuf $tmp/$which.fake-userv
+ fileevent $netlinkfh($site.r) readable \
+ [list netlink-readable $location $site]
+ set fakeuf $tmp/$site.fake-userv
set fakeuh [open $fakeuf w 0755]
puts $fakeuh "#!/bin/sh
set -e
set fakeuh [open $fakeuf w 0755]
puts $fakeuh "#!/bin/sh
set -e
@@
-56,15
+57,15
@@
exec cat
netlink userv-ipif {
name \"netlink\";
userv-path \"$fakeuf\";
netlink userv-ipif {
name \"netlink\";
userv-path \"$fakeuf\";
- $netlink($
which
)
+ $netlink($
site
)
mtu 1400;
buffer sysbuffer(2048);
mtu 1400;
buffer sysbuffer(2048);
- interface \"secnet-test-[string range $
which
0 0]\";
+ interface \"secnet-test-[string range $
site
0 0]\";
};
comm
"
set delim {}
};
comm
"
set delim {}
- foreach port $ports($
which
) {
+ foreach port $ports($
site
) {
append cfg "$delim
udp {
port $port;
append cfg "$delim
udp {
port $port;
@@
-75,15
+76,17
@@
exec cat
set delim ,
}
append cfg ";
set delim ,
}
append cfg ";
- local-name \"test-example/$
which/$which
\";
- local-key rsa-private(\"$builddir/test-example/$
which
.key\");
+ local-name \"test-example/$
location/$site
\";
+ local-key rsa-private(\"$builddir/test-example/$
site
.key\");
"
"
- append cfg $extra($
which
)
- append cfg
{
+ append cfg $extra($
site
)
+ append cfg
"
log logfile {
log logfile {
-
filename "/dev/tty
";
- class
"info","notice","warning","error","security","fatal
";
+
prefix \"$site\
";
+ class
\"debug\",\"info\",\"notice\",\"warning\",\"error\",\"security\",\"fatal\
";
};
};
+ "
+ append cfg {
system {
};
resolver adns {
system {
};
resolver adns {
@@
-98,33
+101,43
@@
exec cat
close $f
append cfg $sites
append cfg {
close $f
append cfg $sites
append cfg {
- sites map(site,
vpn/test-example/
all-sites);
+ sites map(site,all-sites);
}
return $cfg
}
}
return $cfg
}
-proc spawn-secnet {
which
} {
+proc spawn-secnet {
location site
} {
global tmp
global builddir
global netlinkfh
global tmp
global builddir
global netlinkfh
- upvar #0 pids($which) pid
- set cf $tmp/$which.conf
+ global env
+ upvar #0 pids($site) pid
+ set cf $tmp/$site.conf
set ch [open $cf w]
set ch [open $cf w]
- puts $ch [mkconf $
which
]
+ puts $ch [mkconf $
location $site
]
close $ch
set argl [list $builddir/secnet -dvnc $cf]
close $ch
set argl [list $builddir/secnet -dvnc $cf]
+ puts -nonewline "spawn"
+ foreach k [array names env] {
+ switch -glob $k {
+ SECNET_TEST_BUILDDIR { }
+ *SECNET* -
+ *PRELOAD* { puts -nonewline " $k=$env($k)" }
+ }
+ }
+ puts " $argl"
set pid [fork]
if {!$pid} {
execl [lindex $argl 0] [lrange $argl 1 end]
}
set pid [fork]
if {!$pid} {
execl [lindex $argl 0] [lrange $argl 1 end]
}
- puts -nonewline $netlinkfh($
which
.t) [hbytes h2raw c0]
+ puts -nonewline $netlinkfh($
site
.t) [hbytes h2raw c0]
}
}
-proc netlink-readable {
which
} {
+proc netlink-readable {
location site
} {
global ok
global ok
- upvar #0 netlinkfh($
which
.r) fh
+ upvar #0 netlinkfh($
site
.r) fh
read $fh; # empty the buffer
read $fh; # empty the buffer
- switch -exact $
which
{
+ switch -exact $
site
{
inside {
puts OK
set ok 1; # what a bodge
inside {
puts OK
set ok 1; # what a bodge
@@
-167,15
+180,9
@@
proc sendpkt {} {
set socktmp $tmp/s
exec mkdir -p -m700 $socktmp
set socktmp $tmp/s
exec mkdir -p -m700 $socktmp
-regsub {^(?!/)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /
+regsub {^(?!/
|\./
)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /
-proc prefix_preload {lib} {
- global env
- set l {}
- catch { set l [split $env(PRELOAD) :] }
- set l [concat [list $lib] $l]
- set env(LD_PRELOAD) [join $l :]
-}
+proc prefix_preload {lib} { prefix_some_path LD_PRELOAD $lib }
set env(UDP_PRELOAD_DIR) $socktmp
prefix_preload $builddir/stest/udp-preload.so
set env(UDP_PRELOAD_DIR) $socktmp
prefix_preload $builddir/stest/udp-preload.so
@@
-214,8
+221,8
@@
proc udp-relay {data src sock args} {
proc test-kex {} {
udp-proxy
proc test-kex {} {
udp-proxy
- spawn-secnet inside
- spawn-secnet outside
+ spawn-secnet in
in
side
+ spawn-secnet out
out
side
after 500 sendpkt
after 1000 sendpkt
after 500 sendpkt
after 1000 sendpkt