From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 28 Dec 2019 11:49:29 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: v5.3.2^0
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=e62f2727d30cd7166d88447c234dd1f3586f11e0;hp=64d786a18109efc34e89c440e5df5c71a1d4f375;p=nncp.git

Merge branch 'develop'
---

diff --git a/VERSION b/VERSION
index c7cb131..84197c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.3.1
+5.3.2
diff --git a/doc/download.texi b/doc/download.texi
index 01f7d89..42b779d 100644
--- 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.3.1, 5.3.1} @tab 2019-12-25 @tab 1117 KiB
+@tab @url{download/nncp-5.3.1.tar.xz, link} @url{download/nncp-5.3.1.tar.xz.sig, sign}
+@tab @code{23A52819 F0395A6A E05E4176 017DCA3C 4A20A023 EEADA6A3 3168E58D BEE34A5B}
+
 @item @ref{Release 5.3.0, 5.3.0} @tab 2019-12-22 @tab 1112 KiB
 @tab @url{download/nncp-5.3.0.tar.xz, link} @url{download/nncp-5.3.0.tar.xz.sig, sign}
 @tab @code{9F093115 506D00E7 2E41ACD6 3F283172 8430E1C2 8BA4A941 FFA3C65D 89AD4ED0}
diff --git a/doc/install.texi b/doc/install.texi
index 413de36..55d1499 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -1,7 +1,7 @@
 @node Installation
 @unnumbered Installation
 
-@set VERSION 5.3.1
+@set VERSION 5.3.2
 
 Possibly NNCP package already exists for your distribution:
 
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 7361408..791f14e 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,17 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.3.2
+@subsection Релиз 5.3.2
+@itemize
+
+@item
+Исправлена некорректная логика @option{onlinedeadline} timeout-а, при
+котором соединение могло не учитывать факты прихода пакетов и обрывать
+связь.
+
+@end itemize
+
 @node Релиз 5.3.1
 @subsection Релиз 5.3.1
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 697ced8..671f6e3 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,17 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.3.2
+@section Release 5.3.2
+@itemize
+
+@item
+Fixed incorrect logic of @option{onlinedeadline} timeout, where
+connection won't take into account incoming packets events and will
+forcefully disconnect.
+
+@end itemize
+
 @node Release 5.3.1
 @section Release 5.3.1
 @itemize
diff --git a/makedist.sh b/makedist.sh
index d8ba2e8..21368a2 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -140,8 +140,6 @@ cat > $texi <<EOF
 EOF
 makeinfo --plaintext -o NEWS.RU $texi
 
-rm -f $texi
-
 cat > $texi <<EOF
 \input texinfo
 @documentencoding UTF-8
@@ -150,7 +148,6 @@ cat > $texi <<EOF
 @bye
 EOF
 makeinfo --plaintext -o INSTALL $texi
-rm -f $texi
 
 cat > $texi <<EOF
 \input texinfo
@@ -160,6 +157,7 @@ cat > $texi <<EOF
 @bye
 EOF
 makeinfo --plaintext -o THANKS $texi
+
 rm -f $texi
 
 ########################################################################
diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 00943d5..3efb3ea 100644
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: $
 
 PORTNAME=	nncp
-DISTVERSION=	5.3.1
+DISTVERSION=	5.3.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
diff --git a/src/sp.go b/src/sp.go
index aca6f18..37cf265 100644
--- a/src/sp.go
+++ b/src/sp.go
@@ -851,6 +851,9 @@ func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
 			state.Ctx.LogE("sp-process", sds, err, "")
 			return nil, err
 		}
+		if head.Type != SPTypePing {
+			state.RxLastNonPing = state.RxLastSeen
+		}
 		switch head.Type {
 		case SPTypeHalt:
 			state.Ctx.LogD("sp-process", SdsAdd(sds, SDS{"type": "halt"}), "")
@@ -1086,9 +1089,6 @@ func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
 			)
 			return nil, BadPktType
 		}
-		if head.Type != SPTypePing {
-			state.RxLastNonPing = state.RxLastSeen
-		}
 	}
 	if infosGot {
 		var pkts int