Merge branch 'develop'

[nncp.git] / src / cmd / nncp-pkt / main.go

diff --git a/src/cmd/nncp-pkt/main.go b/src/cmd/nncp-pkt/main.go
index 3cd59ecb8c6813e430e9becb1dcd3add024b90f8..c22b1f71038e209bda406fe3c5bf5903420c6291 100644 (file)
--- a/src/cmd/nncp-pkt/main.go
+++ b/src/cmd/nncp-pkt/main.go
@@ -29,7 +29,7 @@ import (
 
        xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/klauspost/compress/zstd"
-       "go.cypherpunks.ru/nncp/v7"
+       "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -84,7 +84,7 @@ func doPlain(ctx *nncp.Ctx, pkt nncp.Pkt, dump, decompress bool) {
        case nncp.PktTypeTrns:
                path = nncp.Base32Codec.EncodeToString(pkt.Path[:pkt.PathLen])
                node, err := ctx.FindNode(path)
-               if err != nil {
+               if err == nil {
                        path = fmt.Sprintf("%s (%s)", path, node.Name)
                }
        case nncp.PktTypeArea:
@@ -119,7 +119,9 @@ func doEncrypted(
        recipientNode := ctx.Neigh[*pktEnc.Recipient]
        if recipientNode == nil {
                area = ctx.AreaId2Area[nncp.AreaId(*pktEnc.Recipient)]
-               recipientName = "area " + area.Name
+               if area != nil {
+                       recipientName = "area " + area.Name
+               }
        } else {
                recipientName = recipientNode.Name
        }
@@ -217,6 +219,8 @@ func main() {
                case nncp.MagicNNCPEv4.B:
                        log.Fatalln(nncp.MagicNNCPEv4.TooOld())
                case nncp.MagicNNCPEv5.B:
+                       log.Fatalln(nncp.MagicNNCPEv5.TooOld())
+               case nncp.MagicNNCPEv6.B:
                        doEncrypted(ctx, pktEnc, *dump, beginning[:nncp.PktEncOverhead])
                        return
                }