test: Consolidate program name in argl

[secnet.git] / test / invoke

diff --git a/test/invoke b/test/invoke
index 30106d95538d62eea53c3594df103210be80d592..569e7c39d9633f3d4a5d345655cd2636cbd9a877 100755 (executable)
--- a/test/invoke
+++ b/test/invoke
@@ -25,11 +25,12 @@ set extra(inside) {
 set extra(outside) {}
 
 proc mkconf {which} {
+    global tmp
     global netlink
     global ports
     global extra
     global netlinkfh
-    set pipefp test/$which.netlink
+    set pipefp $tmp/$which.netlink
     foreach tr {t r} {
        file delete $pipefp.$tr
        exec mkfifo -m600 $pipefp.$tr
@@ -37,7 +38,7 @@ proc mkconf {which} {
        fconfigure $fh -blocking 0 -buffering none -translation binary
     }
     fileevent $netlinkfh($which.r) readable [list netlink-readable $which]
-    set fakeuf test/$which.fake-userv
+    set fakeuf $tmp/$which.fake-userv
     set fakeuh [open $fakeuf w 0755]
     puts $fakeuh "#!/bin/sh
 set -e
@@ -95,15 +96,16 @@ exec cat
 
 proc spawn-secnet {which} {
     global netlinkfh
+    global tmp
     upvar #0 pids($which) pid
-    set cf test/$which.conf
+    set cf $tmp/$which.conf
     set ch [open $cf w]
     puts $ch [mkconf $which]
     close $ch
-    set argl [list -dvnc $cf]
+    set argl [list ./secnet -dvnc $cf]
     set pid [fork]
     if {!$pid} {
-       execl ./secnet $argl
+       execl [lindex $argl 0] [lrange $argl 1 end]
     }
     puts -nonewline $netlinkfh($which.t) [hbytes h2raw c0]
 }
@@ -113,12 +115,12 @@ proc netlink-readable {which} {
     upvar #0 netlinkfh($which.r) fh
     read $fh; # empty the buffer
     switch -exact $which {
-       outside {
+       inside {
            puts OK
            set ok 1; # what a bodge
            return
        }
-       inside {
+       outside {
            error "inside rx'd!"
        }
     }
@@ -139,7 +141,28 @@ $message
     exit 1
 }
 
+proc sendpkt {} {
+    global netlinkfh
+    set p {
+        4500 0054 ed9d 4000 4001 24da ac12 e809
+        ac12 e802 0800 1de4 2d96 0001 f1d4 a05d
+        0000 0000 507f 0b00 0000 0000 1011 1213
+        1415 1617 1819 1a1b 1c1d 1e1f 2021 2223
+        2425 2627 2829 2a2b 2c2d 2e2f 3031 3233
+        3435 3637
+    }
+    puts -nonewline $netlinkfh(inside.t) \
+       [hbytes h2raw c0[join $p ""]c0]
+}
+
+file mkdir test/tmp
+set tmp test/tmp
+
 spawn-secnet inside
 spawn-secnet outside
 
+after 500 sendpkt
+after 1000 sendpkt
+after 5000 timed-out
+
 vwait ok