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 1808e3a61d001d11bf49d3120fe317e70bb48c86..3245970266713ae810ce9c852194cb28e4d57d05 100644 (file)
--- a/src/cmd/nncp-pkt/main.go
+++ b/src/cmd/nncp-pkt/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,9 +27,9 @@ import (
        "log"
        "os"
 
-       "github.com/davecgh/go-xdr/xdr2"
+       xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/klauspost/compress/zstd"
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v6"
 )
 
 func usage() {
@@ -105,12 +105,14 @@ func main() {
                        payloadType = "file request"
                case nncp.PktTypeExec:
                        payloadType = "exec"
+               case nncp.PktTypeExecFat:
+                       payloadType = "exec uncompressed"
                case nncp.PktTypeTrns:
                        payloadType = "transitional"
                }
                var path string
                switch pkt.Type {
-               case nncp.PktTypeExec:
+               case nncp.PktTypeExec, nncp.PktTypeExecFat:
                        path = string(bytes.Replace(
                                pkt.Path[:pkt.PathLen],
                                []byte{0},
@@ -118,7 +120,7 @@ func main() {
                                -1,
                        ))
                case nncp.PktTypeTrns:
-                       path = nncp.ToBase32(pkt.Path[:pkt.PathLen])
+                       path = nncp.Base32Codec.EncodeToString(pkt.Path[:pkt.PathLen])
                default:
                        path = string(pkt.Path[:pkt.PathLen])
                }
@@ -132,7 +134,7 @@ func main() {
        _, err = xdr.Unmarshal(bytes.NewReader(beginning), &pktEnc)
        if err == nil && pktEnc.Magic == nncp.MagicNNCPEv4 {
                if *dump {
-                       ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false)
+                       ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false, false, false)
                        if err != nil {
                                log.Fatalln("Error during initialization:", err)
                        }