nncp-daemon -toss is friendly with -autotoss

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 97c108c2a2d05d78f47ffe616000feaa926cc26d..1a65a501f71ffea8ec1e024cc4ea59e6a15db25e 100644 (file)
--- 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 83b6f960419631b56e5ab2977ce1f3816819317f..1bd2f44e15f0c776a25ed8f6b66f36c284826f83 100644 (file)
--- 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 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
        }

diff --git a/src/nncp.go b/src/nncp.go
index f8915d9b5bf31bc5ba37f79568c29c8095531b6e..a775bd4a8640a16aad825bbcc75a948b3e78c005 100644 (file)
--- 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)
 )