Fix nncp-daemon segfault when SP fails

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index aa4f62ff76387a603924cd28342fcd39b94d85cd..10f1630de86fe591ffc1d9a5b5c5cd2fa17c002b 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 6.5.0
+@subsection Релиз 6.5.0
+@itemize
+
+@item
+Исправлено падение в @command{nncp-daemon} когда SP рукопожатие не было успешно.
+
+@end itemize
+
 @node Релиз 6.4.0
 @subsection Релиз 6.4.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 67340e2ebb66abfe81239334ad790162e6b9fb0c..a270f3e7f93c12434e70f846143d1e30e46c22d5 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 6.5.0
+@section Release 6.5.0
+@itemize
+
+@item
+Fixed segfault in @command{nncp-daemon} when SP handshake did not succeed.
+
+@end itemize
+
 @node Release 6.4.0
 @section Release 6.4.0
 @itemize

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index c398830cbb65c6a315e27e4719bfe652eac4a8ff..4fd2908c87ecd47b174af322d6fbb393b14bd98a 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=      nncp
-DISTVERSION=   6.4.0
+DISTVERSION=   6.5.0
 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 a69175a299f417794e465758e8df3176f2eb95a6..a1b7982a8bdab14819674323cb11299f0b764049 100644 (file)
--- a/src/cmd/nncp-daemon/main.go
+++ b/src/cmd/nncp-daemon/main.go
@@ -108,17 +108,21 @@ func performSP(
                        )
                })
        } else {
-               nodeId := "unknown"
+               var nodeId string
+               var nodeName string
                if state.Node == nil {
+                       nodeId = "unknown"
+                       nodeName = "unknown"
                        nodeIdC <- nil
                } else {
-                       nodeIdC <- state.Node.Id
                        nodeId = state.Node.Id.String()
+                       nodeName = state.Node.Name
+                       nodeIdC <- state.Node.Id
                }
                ctx.LogI(
                        "call-started",
                        nncp.LEs{{K: "Node", V: nodeId}},
-                       func(les nncp.LEs) string { return "Connected to " + state.Node.Name },
+                       func(les nncp.LEs) string { return "Connected to " + nodeName },
                )
        }
        close(nodeIdC)

diff --git a/src/nncp.go b/src/nncp.go
index 7c1b7c576dd04da62f3e61662f21760ba01fe0e9..a9af93cacba68392ca0e7d1a426da10eaf2fa73d 100644 (file)
--- 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 = "6.4.0"
+       Version string = "6.5.0"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )