]> Cypherpunks.ru repositories - nncp.git/blobdiff - src/cmd/nncp-pkt/main.go
Operations progress
[nncp.git] / src / cmd / nncp-pkt / main.go
index 3a7731b0f7bdd4f5ecf5011f517685e51c447ab9..aaf0c2dd90c76337818314f4dd192e5cb1c877c1 100644 (file)
@@ -21,15 +21,15 @@ package main
 import (
        "bufio"
        "bytes"
-       "compress/zlib"
        "flag"
        "fmt"
        "io"
        "log"
        "os"
 
-       "github.com/davecgh/go-xdr/xdr2"
-       "go.cypherpunks.ru/nncp/v4"
+       xdr "github.com/davecgh/go-xdr/xdr2"
+       "github.com/klauspost/compress/zstd"
+       "go.cypherpunks.ru/nncp/v5"
 )
 
 func usage() {
@@ -44,7 +44,7 @@ func main() {
        var (
                overheads  = flag.Bool("overheads", false, "Print packet overheads")
                dump       = flag.Bool("dump", false, "Write decrypted/parsed payload to stdout")
-               decompress = flag.Bool("decompress", false, "Try to zlib decompress dumped data")
+               decompress = flag.Bool("decompress", false, "Try to zstd decompress dumped data")
                cfgPath    = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
                version    = flag.Bool("version", false, "Print version information")
                warranty   = flag.Bool("warranty", false, "Print warranty information")
@@ -77,13 +77,13 @@ func main() {
        }
        var pkt nncp.Pkt
        _, err = xdr.Unmarshal(bytes.NewReader(beginning), &pkt)
-       if err == nil && pkt.Magic == nncp.MagicNNCPPv2 {
+       if err == nil && pkt.Magic == nncp.MagicNNCPPv3 {
                if *dump {
                        bufW := bufio.NewWriter(os.Stdout)
                        var r io.Reader
                        r = bufio.NewReader(os.Stdin)
                        if *decompress {
-                               decompressor, err := zlib.NewReader(r)
+                               decompressor, err := zstd.NewReader(r)
                                if err != nil {
                                        log.Fatalln(err)
                                }
@@ -132,7 +132,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)
                        }