/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2019 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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-// Parse raw NNCP packet
+// Parse raw NNCP packet.
package main
import (
"bufio"
"bytes"
+ "compress/zlib"
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"os"
"cypherpunks.ru/nncp"
"github.com/davecgh/go-xdr/xdr2"
- "github.com/dustin/go-humanize"
- "golang.org/x/crypto/blake2b"
)
func usage() {
fmt.Fprintf(os.Stderr, nncp.UsageHeader())
- fmt.Fprintln(os.Stderr, "nncp-pkt -- parse raw packet\n")
- fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:", os.Args[0])
+ fmt.Fprintf(os.Stderr, "nncp-pkt -- parse raw packet\n\n")
+ fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
flag.PrintDefaults()
fmt.Fprintln(os.Stderr, "Packet is read from stdin.")
}
func main() {
var (
- dump = flag.Bool("dump", false, "Write decrypted/parsed payload to stdout")
- 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")
+ 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")
+ 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")
)
flag.Usage = usage
flag.Parse()
return
}
+ if *overheads {
+ fmt.Printf(
+ "Plain: %d\nEncrypted: %d\nSize: %d\n",
+ nncp.PktOverhead,
+ nncp.PktEncOverhead,
+ nncp.PktSizeOverhead,
+ )
+ return
+ }
+
var err error
- beginning := make([]byte, nncp.PktOverhead-blake2b.Size256)
+ beginning := make([]byte, nncp.PktOverhead)
if _, err = io.ReadFull(os.Stdin, beginning); err != nil {
log.Fatalln("Not enough data to read")
}
var pkt nncp.Pkt
_, err = xdr.Unmarshal(bytes.NewReader(beginning), &pkt)
- if err == nil && pkt.Magic == nncp.MagicNNCPPv1 {
+ if err == nil && pkt.Magic == nncp.MagicNNCPPv2 {
if *dump {
bufW := bufio.NewWriter(os.Stdout)
- if _, err = io.Copy(bufW, bufio.NewReader(os.Stdin)); err != nil {
+ var r io.Reader
+ r = bufio.NewReader(os.Stdin)
+ if *decompress {
+ decompressor, err := zlib.NewReader(r)
+ if err != nil {
+ log.Fatalln(err)
+ }
+ r = decompressor
+ }
+ if _, err = io.Copy(bufW, r); err != nil {
log.Fatalln(err)
}
if err = bufW.Flush(); err != nil {
payloadType = "file"
case nncp.PktTypeFreq:
payloadType = "file request"
- case nncp.PktTypeMail:
- payloadType = "mail"
+ case nncp.PktTypeExec:
+ payloadType = "exec"
case nncp.PktTypeTrns:
payloadType = "transitional"
}
var path string
switch pkt.Type {
+ case nncp.PktTypeExec:
+ path = string(bytes.Replace(
+ pkt.Path[:pkt.PathLen],
+ []byte{0},
+ []byte(" "),
+ -1,
+ ))
case nncp.PktTypeTrns:
path = nncp.ToBase32(pkt.Path[:pkt.PathLen])
default:
path = string(pkt.Path[:pkt.PathLen])
}
- fmt.Printf("Packet type: plain\nPayload type: %s\nPath: %s\n", payloadType, path)
+ fmt.Printf(
+ "Packet type: plain\nPayload type: %s\nNiceness: %s (%d)\nPath: %s\n",
+ payloadType, nncp.NicenessFmt(pkt.Nice), pkt.Nice, path,
+ )
return
}
var pktEnc nncp.PktEnc
_, err = xdr.Unmarshal(bytes.NewReader(beginning), &pktEnc)
- if err == nil && pktEnc.Magic == nncp.MagicNNCPEv1 {
+ if err == nil && pktEnc.Magic == nncp.MagicNNCPEv4 {
if *dump {
- cfgRaw, err := ioutil.ReadFile(*cfgPath)
+ ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false)
if err != nil {
- log.Fatalln("Can not read config:", err)
+ log.Fatalln("Error during initialization:", err)
}
- ctx, err := nncp.CfgParse(cfgRaw)
- if err != nil {
- log.Fatalln("Can not parse config:", err)
+ if ctx.Self == nil {
+ log.Fatalln("Config lacks private keys")
}
bufW := bufio.NewWriter(os.Stdout)
- if _, err = nncp.PktEncRead(
+ if _, _, err = nncp.PktEncRead(
ctx.Self,
ctx.Neigh,
io.MultiReader(
return
}
fmt.Printf(
- "Packet type: encrypted\nNiceness: %d\nSender: %s\nPayload size: %s (%d bytes)\n",
- pktEnc.Nice, pktEnc.Sender, humanize.IBytes(pktEnc.Size), pktEnc.Size,
+ "Packet type: encrypted\nNiceness: %s (%d)\nSender: %s\nRecipient: %s\n",
+ nncp.NicenessFmt(pktEnc.Nice), pktEnc.Nice, pktEnc.Sender, pktEnc.Recipient,
)
return
}