nncp-caller's -autotoss* workability

[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 dd93bfffe044f04abcb12751e58848267b33939f..d4fff0ca93e792c469332e8c1e5f5122cd1e8ed9 100644 (file)
--- a/src/cmd/nncp-caller/main.go
+++ b/src/cmd/nncp-caller/main.go
@@ -49,6 +49,13 @@ func main() {
                debug     = flag.Bool("debug", false, "Print debug messages")
                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")
        )
        flag.Usage = usage
        flag.Parse()
@@ -177,15 +184,15 @@ func main() {
 
                                                var autoTossFinish chan struct{}
                                                var autoTossBadCode chan bool
-                                               if call.AutoToss {
+                                               if call.AutoToss || *autoToss {
                                                        autoTossFinish, autoTossBadCode = ctx.AutoToss(
                                                                node.Id,
                                                                call.Nice,
-                                                               call.AutoTossDoSeen,
-                                                               call.AutoTossNoFile,
-                                                               call.AutoTossNoFreq,
-                                                               call.AutoTossNoExec,
-                                                               call.AutoTossNoTrns,
+                                                               call.AutoTossDoSeen || *autoTossDoSeen,
+                                                               call.AutoTossNoFile || *autoTossNoFile,
+                                                               call.AutoTossNoFreq || *autoTossNoFreq,
+                                                               call.AutoTossNoExec || *autoTossNoExec,
+                                                               call.AutoTossNoTrns || *autoTossNoTrns,
                                                        )
                                                }
 
@@ -203,7 +210,7 @@ func main() {
                                                        nil,
                                                )
 
-                                               if call.AutoToss {
+                                               if call.AutoToss || *autoToss {
                                                        close(autoTossFinish)
                                                        <-autoTossBadCode
                                                }