From 45041bb8ac62b001448ccaa7550b408de3d3cbc3 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 23 Jan 2021 12:34:51 +0300
Subject: [PATCH] nncp-daemon -toss is friendly with -autotoss

---
 doc/news.ru.texi            | 10 ++++++++++
 doc/news.texi               | 10 ++++++++++
 src/cmd/nncp-daemon/main.go | 21 +++++++++++++++++++--
 src/nncp.go                 |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 97c108c..1a65a50 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,16 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.7.0
+@subsection Релиз 5.7.0
+@itemize
+
+@item
+Работоспособность @option{-autotoss*} опции с @option{-inetd} режимом
+@command{nncp-daemon}.
+
+@end itemize
+
 @node Релиз 5.6.0
 @subsection Релиз 5.6.0
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 83b6f96..1bd2f44 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,16 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.7.0
+@section Release 5.7.0
+@itemize
+
+@item
+@option{-autotoss*} option workability with @command{nncp-daemon}'s
+@option{-inetd} mode.
+
+@end itemize
+
 @node Release 5.6.0
 @section Release 5.6.0
 @itemize
diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go
index b2b8911..7c1ddaa 100644
--- 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
 	}
diff --git a/src/nncp.go b/src/nncp.go
index f8915d9..a775bd4 100644
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 )
 
 var (
-	Version string = "5.6.0"
+	Version string = "5.7.0"
 
 	Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )
-- 
2.44.0