Merge branch 'develop'

diff --git a/VERSION b/VERSION
index 91ff57278e37ef9cecfeaea47f0d77966799af28..26d99a283f21aa125ccd146e50e76a9b643f54f1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.2.0
+5.2.1

diff --git a/doc/Makefile b/doc/Makefile
index 0223490c9cb798e7ac088297827af127c5eb8f79..205c2b4ee40c99361eda25fe9a9493b64f77029b 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,7 +1,7 @@
-all: nncp.info nncp.html
-
 MAKEINFO ?= makeinfo
 
+all: nncp.info nncp.html
+
 sp.utxt: sp.txt
        plantuml -tutxt sp.txt
 

diff --git a/doc/download.texi b/doc/download.texi
index 6282b292416741309e77c760accef5eb41ebad0b..2eb52ff9641c74f42a05c72f80f22f59fdf07645 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -24,6 +24,10 @@ Tarballs include all necessary required libraries:
 @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 5.2.0, 5.2.0} @tab 2019-12-14 @tab 1109 KiB
+@tab @url{download/nncp-5.2.0.tar.xz, link} @url{download/nncp-5.2.0.tar.xz.sig, sign}
+@tab @code{FFC55467 8B4ECCA6 92D90F42 ACC0286D 209E054E EA1CBF87 0307003E CF219610}
+
 @item @ref{Release 5.1.2, 5.1.2} @tab 2019-12-13 @tab 1106 KiB
 @tab @url{download/nncp-5.1.2.tar.xz, link} @url{download/nncp-5.1.2.tar.xz.sig, sign}
 @tab @code{52B2043B 1B22D20F C44698EC AFE5FF46 F99B4DD5 2C392D4D 25FE1580 993263B3}

diff --git a/doc/index.texi b/doc/index.texi
index 56480cf374f0afc034dcbdda455ff9b91db4dd37..a83ea31be352e50881770dd47b23e6262883cb4d 100644 (file)
--- a/doc/index.texi
+++ b/doc/index.texi
@@ -2,8 +2,6 @@
 @documentencoding UTF-8
 @settitle NNCP
 
-@set VERSION 5.2.0
-
 @copying
 This manual is for NNCP (Node to Node copy) --  collection of utilities
 simplifying secure store-and-forward files and mail exchanging.

diff --git a/doc/install.texi b/doc/install.texi
index b94b3bc41caba176d41e21a7263444ccaa47041f..1c8497e6f2ab6679a0d003e69e03d26779883849 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -1,6 +1,8 @@
 @node Installation
 @unnumbered Installation
 
+@set VERSION 5.2.1
+
 Possibly NNCP package already exists for your distribution:
 
 @itemize

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index fa95bf5c9eeaac3054d8d5ec2cb748b0aa4bef37..2e5d927bdf90546a1bcd4194767b9b676a0c57c7 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.2.1
+@subsection Релиз 5.2.1
+@itemize
+
+@item
+Исправлена обработка ошибки SP протокола, иногда вызывающая панику программы.
+
+@end itemize
+
 @node Релиз 5.2.0
 @subsection Релиз 5.2.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 461355755cd5b498f507e3768d5acc9a3ea83730..6cdc9981afaf2033bc48a0c4e0adde26e929ae03 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.2.1
+@section Release 5.2.1
+@itemize
+
+@item
+Fixed SP protocol error handling, sometimes causing program panic.
+
+@end itemize
+
 @node Release 5.2.0
 @section Release 5.2.0
 @itemize

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 31bf18aafba1b8e20c2d732497f6af2538351e39..6dca46acaaf714e7a90180959966a44eb38c4fe5 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: head/net/nncp/Makefile 517819 2019-11-17 11:51:56Z dmgk $
 
 PORTNAME=      nncp
-DISTVERSION=   5.2.0
+DISTVERSION=   5.2.1
 CATEGORIES=    net
 MASTER_SITES=  http://www.nncpgo.org/download/
 

diff --git a/src/sp.go b/src/sp.go
index ce2e62f5d86be3492fc7a4192bca978c9c62b760..fa853b033779d971c5d3e35299961d7c36064964 100644 (file)
--- a/src/sp.go
+++ b/src/sp.go
@@ -680,6 +680,9 @@ func (state *SPState) StartWorkers(
                        conn.SetReadDeadline(time.Now().Add(DefaultDeadline * time.Second))
                        payload, err := state.ReadSP(conn)
                        if err != nil {
+                               if err == io.EOF {
+                                       break
+                               }
                                unmarshalErr := err.(*xdr.UnmarshalError)
                                netErr, ok := unmarshalErr.Err.(net.Error)
                                if ok && netErr.Timeout() {