From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 30 Oct 2022 15:08:19 +0000 (+0300)
Subject: Fixed nncp-daemon fail with --autotoss
X-Git-Tag: v8.8.1^2~1
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=829fe10fa752d263386772680fa1a8b87e9e90fa

Fixed nncp-daemon fail with --autotoss
---

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index e305914..0a0edb0 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,16 @@
 @node Новости
 @section Новости
 
+@node Релиз 8.8.1
+@subsection Релиз 8.8.1
+@itemize
+
+@item
+Исправлено падение @command{nncp-daemon} при неопознанном подключении и
+включённом @option{-autotoss}.
+
+@end itemize
+
 @node Релиз 8.8.0
 @subsection Релиз 8.8.0
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index c640a99..de85706 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -4,6 +4,16 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 8_8_1
+@section Release 8.8.1
+@itemize
+
+@item
+Fixed @command{nncp-daemon} failing with unauthenticated connection and
+enabled @option{-autotoss}.
+
+@end itemize
+
 @node Release 8_8_0
 @section Release 8.8.0
 @itemize
diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index dbc14e4..920d863 100644
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nncp
-DISTVERSION=	8.7.1
+DISTVERSION=	8.8.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go
index 710b687..bcd5bcd 100644
--- a/src/cmd/nncp-daemon/main.go
+++ b/src/cmd/nncp-daemon/main.go
@@ -222,7 +222,7 @@ func main() {
 			)
 		}
 		<-nodeIdC // call completion
-		if *autoToss {
+		if *autoToss && nodeId != nil {
 			close(autoTossFinish)
 			<-autoTossBadCode
 		}
@@ -309,7 +309,7 @@ func main() {
 				)
 			}
 			<-nodeIdC // call completion
-			if *autoToss {
+			if *autoToss && nodeId != nil {
 				close(autoTossFinish)
 				<-autoTossBadCode
 			}
diff --git a/src/nncp.go b/src/nncp.go
index 31ba33b..a261522 100644
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 const Base32Encoded32Len = 52
 
 var (
-	Version string = "8.8.0"
+	Version string = "8.8.1"
 
 	Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )