/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2020 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
"archive/tar"
"bufio"
"bytes"
+ "errors"
"flag"
"fmt"
"io"
"log"
"os"
"path/filepath"
- "strconv"
"strings"
xdr "github.com/davecgh/go-xdr/xdr2"
spoolPath = flag.String("spool", "", "Override path to spool")
logPath = flag.String("log", "", "Override path to logfile")
quiet = flag.Bool("quiet", false, "Print only errors")
+ showPrgrs = flag.Bool("progress", false, "Force progress showing")
+ omitPrgrs = flag.Bool("noprogress", false, "Omit progress showing")
debug = flag.Bool("debug", false, "Print debug messages")
version = flag.Bool("version", false, "Print version information")
warranty = flag.Bool("warranty", false, "Print warranty information")
log.Fatalln("At least one of -rx and -tx must be specified")
}
- ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
+ ctx, err := nncp.CtxFromCmdline(
+ *cfgPath,
+ *spoolPath,
+ *logPath,
+ *quiet,
+ *showPrgrs,
+ *omitPrgrs,
+ *debug,
+ )
if err != nil {
log.Fatalln("Error during initialization:", err)
}
sds["pkt"] = pktName
if job.PktEnc.Nice > nice {
ctx.LogD("nncp-bundle", sds, "too nice")
- job.Fd.Close()
+ job.Fd.Close() // #nosec G104
continue
}
if err = tarWr.WriteHeader(&tar.Header{
}); err != nil {
log.Fatalln("Error writing tar header:", err)
}
- if _, err = io.Copy(tarWr, job.Fd); err != nil {
+ if _, err = nncp.CopyProgressed(
+ tarWr, job.Fd, "Tx",
+ nncp.SdsAdd(sds, nncp.SDS{
+ "pkt": nncp.Base32Codec.EncodeToString(job.HshValue[:]),
+ "fullsize": job.Size,
+ }),
+ ctx.ShowPrgrs,
+ ); err != nil {
log.Fatalln("Error during copying to tar:", err)
}
- job.Fd.Close()
+ job.Fd.Close() // #nosec G104
if err = tarWr.Flush(); err != nil {
log.Fatalln("Error during tar flushing:", err)
}
log.Fatalln("Error during deletion:", err)
}
}
- ctx.LogI("nncp-bundle", nncp.SdsAdd(sds, nncp.SDS{
- "size": strconv.FormatInt(job.Size, 10),
- }), "")
+ ctx.LogI("nncp-bundle", nncp.SdsAdd(sds, nncp.SDS{"size": job.Size}), "")
}
}
if err = tarWr.Close(); err != nil {
}
} else {
bufStdin := bufio.NewReaderSize(os.Stdin, CopyBufSize*2)
- var peeked []byte
- var prefixIdx int
- var tarR *tar.Reader
- var entry *tar.Header
- var exists bool
pktEncBuf := make([]byte, nncp.PktEncOverhead)
var pktEnc *nncp.PktEnc
- var pktName string
- var selfPath string
- var dstPath string
for {
- peeked, err = bufStdin.Peek(CopyBufSize)
+ peeked, err := bufStdin.Peek(CopyBufSize)
if err != nil && err != io.EOF {
log.Fatalln("Error during reading:", err)
}
- prefixIdx = bytes.Index(peeked, []byte(nncp.NNCPBundlePrefix))
+ prefixIdx := bytes.Index(peeked, []byte(nncp.NNCPBundlePrefix))
if prefixIdx == -1 {
if err == io.EOF {
break
}
- bufStdin.Discard(bufStdin.Buffered() - (len(nncp.NNCPBundlePrefix) - 1))
+ bufStdin.Discard(bufStdin.Buffered() - (len(nncp.NNCPBundlePrefix) - 1)) // #nosec G104
continue
}
- bufStdin.Discard(prefixIdx)
- tarR = tar.NewReader(bufStdin)
+ if _, err = bufStdin.Discard(prefixIdx); err != nil {
+ panic(err)
+ }
+ tarR := tar.NewReader(bufStdin)
sds["xx"] = string(nncp.TRx)
- entry, err = tarR.Next()
+ entry, err := tarR.Next()
if err != nil {
if err != io.EOF {
ctx.LogD(
ctx.LogD("nncp-bundle", sds, "Too small packet")
continue
}
- pktName = filepath.Base(entry.Name)
- if _, err = nncp.FromBase32(pktName); err != nil {
- ctx.LogD("nncp-bundle", sds, "Bad packet name")
+ if !ctx.IsEnoughSpace(entry.Size) {
+ ctx.LogE("nncp-bundle", sds, errors.New("not enough spool space"), "")
+ continue
+ }
+ pktName := filepath.Base(entry.Name)
+ if _, err = nncp.Base32Codec.DecodeString(pktName); err != nil {
+ ctx.LogD("nncp-bundle", nncp.SdsAdd(sds, nncp.SDS{"err": "bad packet name"}), "")
continue
}
if _, err = io.ReadFull(tarR, pktEncBuf); err != nil {
}
if *pktEnc.Sender == *ctx.SelfId && *doDelete {
if len(nodeIds) > 0 {
- if _, exists = nodeIds[*pktEnc.Recipient]; !exists {
+ if _, exists := nodeIds[*pktEnc.Recipient]; !exists {
ctx.LogD("nncp-bundle", sds, "Recipient is not requested")
continue
}
}
- nodeId32 := nncp.ToBase32(pktEnc.Recipient[:])
+ nodeId32 := nncp.Base32Codec.EncodeToString(pktEnc.Recipient[:])
sds["xx"] = string(nncp.TTx)
sds["node"] = nodeId32
sds["pkt"] = pktName
- dstPath = filepath.Join(
+ dstPath := filepath.Join(
ctx.Spool,
nodeId32,
string(nncp.TTx),
if _, err = hsh.Write(pktEncBuf); err != nil {
log.Fatalln("Error during writing:", err)
}
- if _, err = io.Copy(hsh, tarR); err != nil {
+ if _, err = nncp.CopyProgressed(
+ hsh, tarR, "Rx",
+ nncp.SdsAdd(sds, nncp.SDS{"fullsize": entry.Size}),
+ ctx.ShowPrgrs,
+ ); err != nil {
log.Fatalln("Error during copying:", err)
}
- if nncp.ToBase32(hsh.Sum(nil)) == pktName {
+ if nncp.Base32Codec.EncodeToString(hsh.Sum(nil)) == pktName {
ctx.LogI("nncp-bundle", sds, "removed")
if !*dryRun {
- os.Remove(dstPath)
+ os.Remove(dstPath) // #nosec G104
}
} else {
- ctx.LogE("nncp-bundle", sds, "bad checksum")
+ ctx.LogE("nncp-bundle", sds, errors.New("bad checksum"), "")
}
continue
}
continue
}
if len(nodeIds) > 0 {
- if _, exists = nodeIds[*pktEnc.Sender]; !exists {
+ if _, exists := nodeIds[*pktEnc.Sender]; !exists {
ctx.LogD("nncp-bundle", sds, "Sender is not requested")
continue
}
}
- sds["node"] = nncp.ToBase32(pktEnc.Recipient[:])
+ sds["node"] = nncp.Base32Codec.EncodeToString(pktEnc.Recipient[:])
sds["pkt"] = pktName
- selfPath = filepath.Join(ctx.Spool, ctx.SelfId.String(), string(nncp.TRx))
- dstPath = filepath.Join(selfPath, pktName)
+ sds["fullsize"] = entry.Size
+ selfPath := filepath.Join(ctx.Spool, ctx.SelfId.String(), string(nncp.TRx))
+ dstPath := filepath.Join(selfPath, pktName)
if _, err = os.Stat(dstPath); err == nil || !os.IsNotExist(err) {
ctx.LogD("nncp-bundle", sds, "Packet already exists")
continue
if _, err = hsh.Write(pktEncBuf); err != nil {
log.Fatalln("Error during writing:", err)
}
- if _, err = io.Copy(hsh, tarR); err != nil {
+ if _, err = nncp.CopyProgressed(hsh, tarR, "check", sds, ctx.ShowPrgrs); err != nil {
log.Fatalln("Error during copying:", err)
}
- if nncp.ToBase32(hsh.Sum(nil)) != pktName {
- ctx.LogE("nncp-bundle", sds, "bad checksum")
+ if nncp.Base32Codec.EncodeToString(hsh.Sum(nil)) != pktName {
+ ctx.LogE("nncp-bundle", sds, errors.New("bad checksum"), "")
continue
}
} else {
if _, err = tmp.W.Write(pktEncBuf); err != nil {
log.Fatalln("Error during writing:", err)
}
- if _, err = io.Copy(tmp.W, tarR); err != nil {
+ if _, err = nncp.CopyProgressed(tmp.W, tarR, "check", sds, ctx.ShowPrgrs); err != nil {
log.Fatalln("Error during copying:", err)
}
if err = tmp.W.Flush(); err != nil {
log.Fatalln("Error during flusing:", err)
}
- if nncp.ToBase32(tmp.Hsh.Sum(nil)) == pktName {
+ if nncp.Base32Codec.EncodeToString(tmp.Hsh.Sum(nil)) == pktName {
if err = tmp.Commit(selfPath); err != nil {
log.Fatalln("Error during commiting:", err)
}
} else {
- ctx.LogE("nncp-bundle", sds, "bad checksum")
+ ctx.LogE("nncp-bundle", sds, errors.New("bad checksum"), "")
tmp.Cancel()
continue
}
}
} else {
if *dryRun {
- if _, err = io.Copy(ioutil.Discard, tarR); err != nil {
+ if _, err = nncp.CopyProgressed(ioutil.Discard, tarR, "Rx", sds, ctx.ShowPrgrs); err != nil {
log.Fatalln("Error during copying:", err)
}
} else {
if _, err = bufTmp.Write(pktEncBuf); err != nil {
log.Fatalln("Error during writing:", err)
}
- if _, err = io.Copy(bufTmp, tarR); err != nil {
+ if _, err = nncp.CopyProgressed(bufTmp, tarR, "Rx", sds, ctx.ShowPrgrs); err != nil {
log.Fatalln("Error during copying:", err)
}
if err = bufTmp.Flush(); err != nil {
if err = tmp.Sync(); err != nil {
log.Fatalln("Error during syncing:", err)
}
- tmp.Close()
+ if err = tmp.Close(); err != nil {
+ log.Fatalln("Error during closing:", err)
+ }
if err = os.MkdirAll(selfPath, os.FileMode(0777)); err != nil {
log.Fatalln("Error during mkdir:", err)
}
}
}
ctx.LogI("nncp-bundle", nncp.SdsAdd(sds, nncp.SDS{
- "size": strconv.FormatInt(entry.Size, 10),
+ "size": sds["fullsize"],
}), "")
}
}