From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 7 Mar 2021 14:32:04 +0000 (+0300)
Subject: nncp-caller's -autotoss* workability
X-Git-Tag: v6.2.0^2
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=3ef61a935ab74f128ce3205cb55ec637df8effbc

nncp-caller's -autotoss* workability
---

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 1a9dc69..a35e296 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -5,6 +5,9 @@
 @subsection Релиз 6.2.0
 @itemize
 
+@item
+Возвращена работоспособность @option{-autotoss*} опций @command{nncp-caller}.
+
 @item
 Очередной рефакторинг и упрощение системы журналирования.
 Не должно быть видимых изменений для конечного пользователя.
diff --git a/doc/news.texi b/doc/news.texi
index 8c809d3..193b625 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -7,6 +7,9 @@ See also this page @ref{Новости, on russian}.
 @section Release 6.2.0
 @itemize
 
+@item
+Returned @command{nncp-caller}'s @option{-autotoss*} options workability.
+
 @item
 Yet another logging refactoring and simplification.
 Should be no visible differences to the end user.
diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go
index dd93bff..d4fff0c 100644
--- 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
 						}