X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=stest%2Fcommon.tcl;h=cbf8fc1fae8902a7c60bc945bddfd30d31d3441c;hb=59053a60ee9c49a6123022120321bfc451458d85;hp=064d8740fe245b9295e2688dfc618f641d448b6d;hpb=c51dedf733b465a6f68195ddd5965d1653c696c1;p=secnet.git

diff --git a/stest/common.tcl b/stest/common.tcl
index 064d874..cbf8fc1 100644
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -25,6 +25,11 @@ set extra(inside) {
 }
 set extra(outside) {}
 
+set privkey(inside) test-example/inside.privkeys/
+set privkey(outside) test-example/outside.privkeys/
+
+proc sitesconf_hook {l} { return $l }
+
 proc mkconf {location site} {
     global tmp
     global builddir
@@ -32,6 +37,7 @@ proc mkconf {location site} {
     global ports
     global extra
     global netlinkfh
+    upvar #0 privkey($site) privkey
     set pipefp $tmp/$site.netlink
     foreach tr {t r} {
 	file delete $pipefp.$tr
@@ -54,6 +60,7 @@ exec cat
 "
     close $fakeuh
     set cfg "
+	hash sha1;
 	netlink userv-ipif {
 	    name \"netlink\";
             userv-path \"$fakeuf\";
@@ -77,8 +84,25 @@ exec cat
     }
     append cfg ";
 	local-name \"test-example/$location/$site\";
-	local-key rsa-private(\"$builddir/test-example/$site.key\");
 "
+    switch -glob $privkey {
+	*/ {
+	    set sitesconf sites.conf
+	    append cfg "
+	        key-cache priv-cache({
+		    privkeys \"$builddir/${privkey}priv.\";
+                });
+"
+	}
+	* {
+	    set sitesconf sites-nonego.conf
+	    append cfg "
+		local-key rsa-private(\"$builddir/$privkey\");
+"
+	}
+    }
+    set sitesconf $builddir/test-example/$sitesconf
+    
     append cfg $extra($site)
     append cfg "
 	log logfile {
@@ -96,13 +120,23 @@ exec cat
 	transform eax-serpent { }, serpent256-cbc { };
     }
 
-    set f [open $builddir/test-example/sites.conf r]
+    set pubkeys $tmp/$site.pubkeys
+    file delete -force $pubkeys
+    exec cp -rl $builddir/test-example/pubkeys $pubkeys
+
+    set f [open $sitesconf r]
+    while {[gets $f l] >= 0} {
+	regsub {\"[^\"]*test-example/pubkeys/} $l "\"$pubkeys/" l
+	set l [sitesconf_hook $l]
+	append cfg $l "\n"
+    }
     set sites [read $f]
     close $f
     append cfg $sites
     append cfg {
 	sites map(site,all-sites);
     }
+
     return $cfg
 }
 
@@ -111,7 +145,10 @@ proc spawn-secnet {location site} {
     global builddir
     global netlinkfh
     global env
+    global pidmap
+    global readbuf
     upvar #0 pids($site) pid
+    set readbuf($site) {}
     set cf $tmp/$site.conf
     set ch [open $cf w]
     puts $ch [mkconf $location $site]
@@ -145,6 +182,7 @@ proc spawn-secnet {location site} {
     }
     if {[llength $argl]} { 
 	set pid [fork]
+	set pidmap($pid) "secnet $location/$site"
 	if {!$pid} {
 	    execl [lindex $argl 0] [lrange $argl 1 end]
 	}
@@ -154,13 +192,37 @@ proc spawn-secnet {location site} {
 
 proc netlink-readable {location site} {
     global ok
+    upvar #0 readbuf($site) buf
     upvar #0 netlinkfh($site.r) fh
-    read $fh; # empty the buffer
+    while 1 {
+	set x [read $fh]
+	set h [hbytes raw2h $x]
+	if {![hbytes length $h]} return
+	append buf $h
+	#puts "READABLE $site buf=$buf"
+	while {[regexp {^((?:..)*?)c0(.*)$} $buf dummy now buf]} {
+	    #puts "READABLE $site now=$now (buf=$buf)"
+	    regsub -all {^((?:..)*?)dbdc} $now {\1c0} now
+	    regsub -all {^((?:..)*?)dbdd} $now {\1db} now
+	    puts "netlink-got-packet $location $site $now"
+	    netlink-got-packet $location $site $now
+	}
+    }
+}
+
+proc netlink-got-packet {location site data} {
+    if {![hbytes length $data]} return 
     switch -exact $site {
 	inside {
-	    puts OK
-	    set ok 1; # what a bodge
-	    return
+	    switch -glob $data {
+		45000054ed9d4000fe0166d9ac12e802ac12e80900* {
+		    puts "OK $data"
+		    finish 0
+		}
+		* {
+		    error "unexpected $site $data"
+		}
+	    }
 	}
 	outside {
 	    error "inside rx'd!"
@@ -208,9 +270,29 @@ prefix_preload $builddir/stest/udp-preload.so
 
 proc finish {estatus} {
     puts stderr "FINISHING $estatus"
+    signal default SIGCHLD
+    global pidmap
+    foreach pid [array names pidmap] {
+	kill KILL $pid
+    }
     exit $estatus
 }
 
+proc reap {} {
+    global pidmap
+    #puts stderr REAPING
+    foreach pid [array names pidmap] {
+	set got [wait -nohang $pid]
+	if {![llength $got]} continue
+	set info $pidmap($pid)
+	unset pidmap($pid)
+	puts stderr "reaped $info: $got"
+	finish 1
+    }
+}
+
+signal -restart trap SIGCHLD { after idle reap }
+
 proc udp-proxy {} {
     global socktmp udpsock
     set u $socktmp/udp