AutoToss every second, not after call is finished

[nncp.git] / src / cmd / nncp-caller / main.go

diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go
index 421f0faa08d3593c94933dfb76f3b7776aa1584f..0a549e45e870c588c4d856a79a5be4771bd897ec 100644 (file)
--- a/src/cmd/nncp-caller/main.go
+++ b/src/cmd/nncp-caller/main.go
@@ -50,12 +50,12 @@ func main() {
                version   = flag.Bool("version", false, "Print version information")
                warranty  = flag.Bool("warranty", false, "Print warranty information")
 
-               autotoss       = flag.Bool("autotoss", false, "Toss after call is finished")
-               autotossDoSeen = flag.Bool("autotoss-seen", false, "Create .seen files during tossing")
-               autotossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing")
-               autotossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing")
-               autotossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing")
-               autotossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing")
+               autoToss       = flag.Bool("autotoss", false, "Toss after call is finished")
+               autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create .seen files during tossing")
+               autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing")
+               autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing")
+               autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing")
+               autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing")
        )
        flag.Usage = usage
        flag.Parse()
@@ -140,6 +140,21 @@ func main() {
                                        } else {
                                                node.Busy = true
                                                node.Unlock()
+
+                                               var autoTossFinish chan struct{}
+                                               var autoTossBadCode chan bool
+                                               if *autoToss {
+                                                       autoTossFinish, autoTossBadCode = ctx.AutoToss(
+                                                               node.Id,
+                                                               call.Nice,
+                                                               *autoTossDoSeen,
+                                                               *autoTossNoFile,
+                                                               *autoTossNoFreq,
+                                                               *autoTossNoExec,
+                                                               *autoTossNoTrns,
+                                                       )
+                                               }
+
                                                ctx.CallNode(
                                                        node,
                                                        addrs,
@@ -152,17 +167,10 @@ func main() {
                                                        false,
                                                        nil,
                                                )
-                                               if *autotoss {
-                                                       ctx.Toss(
-                                                               node.Id,
-                                                               call.Nice,
-                                                               false,
-                                                               *autotossDoSeen,
-                                                               *autotossNoFile,
-                                                               *autotossNoFreq,
-                                                               *autotossNoExec,
-                                                               *autotossNoTrns,
-                                                       )
+
+                                               if *autoToss {
+                                                       close(autoTossFinish)
+                                                       <-autoTossBadCode
                                                }
 
                                                node.Lock()