nncp-daemon -toss is friendly with -autotoss

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

diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go
index b2b8911ec21b2abbbc6daaf30b40d253d7b9fcc0..7c1ddaa43bf19958d7574a5d19443e966556e4d9 100644 (file)
--- a/src/cmd/nncp-daemon/main.go
+++ b/src/cmd/nncp-daemon/main.go
@@ -161,8 +161,25 @@ func main() {
                conn := &InetdConn{os.Stdin, os.Stdout}
                nodeIdC := make(chan *nncp.NodeId)
                go performSP(ctx, conn, nice, nodeIdC)
-               <-nodeIdC    // nodeId
-               <-nodeIdC    // call completion
+               nodeId := <-nodeIdC
+               var autoTossFinish chan struct{}
+               var autoTossBadCode chan bool
+               if *autoToss && nodeId != nil {
+                       autoTossFinish, autoTossBadCode = ctx.AutoToss(
+                               nodeId,
+                               nice,
+                               *autoTossDoSeen,
+                               *autoTossNoFile,
+                               *autoTossNoFreq,
+                               *autoTossNoExec,
+                               *autoTossNoTrns,
+                       )
+               }
+               <-nodeIdC // call completion
+               if *autoToss {
+                       close(autoTossFinish)
+                       <-autoTossBadCode
+               }
                conn.Close() // #nosec G104
                return
        }