/*
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/>.
*/
-// Create/digest stream of NNCP encrypted packets
+// Create/digest stream of NNCP encrypted packets.
package main
import (
func usage() {
fmt.Fprintf(os.Stderr, nncp.UsageHeader())
- fmt.Fprintln(os.Stderr, "nncp-bundle -- Create/digest stream of NNCP encrypted packets\n")
+ fmt.Fprintf(os.Stderr, "nncp-bundle -- Create/digest stream of NNCP encrypted packets\n\n")
fmt.Fprintf(os.Stderr, "Usage: %s [options] -tx [-delete] NODE [NODE ...] > ...\n", os.Args[0])
- fmt.Fprintf(os.Stderr, " %s [options] -rx -delete [NODE ...] < ...\n", os.Args[0])
- fmt.Fprintf(os.Stderr, " %s [options] -rx [-check] [NODE ...] < ...\n", os.Args[0])
+ fmt.Fprintf(os.Stderr, " %s [options] -rx -delete [-dryrun] [NODE ...] < ...\n", os.Args[0])
+ fmt.Fprintf(os.Stderr, " %s [options] -rx [-check] [-dryrun] [NODE ...] < ...\n", os.Args[0])
fmt.Fprintln(os.Stderr, "Options:")
flag.PrintDefaults()
}
func main() {
var (
- cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
- niceRaw = flag.Int("nice", 255, "Minimal required niceness")
- doRx = flag.Bool("rx", false, "Receive packets")
- doTx = flag.Bool("tx", false, "Transfer packets")
- doDelete = flag.Bool("delete", false, "Delete transferred packets")
- doCheck = flag.Bool("check", false, "Check integrity while receiving")
- quiet = flag.Bool("quiet", false, "Print only errors")
- debug = flag.Bool("debug", false, "Print debug messages")
- version = flag.Bool("version", false, "Print version information")
- warranty = flag.Bool("warranty", false, "Print warranty information")
+ cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+ niceRaw = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness")
+ doRx = flag.Bool("rx", false, "Receive packets")
+ doTx = flag.Bool("tx", false, "Transfer packets")
+ doDelete = flag.Bool("delete", false, "Delete transferred packets")
+ doCheck = flag.Bool("check", false, "Check integrity while receiving")
+ dryRun = flag.Bool("dryrun", false, "Do no writes")
+ spoolPath = flag.String("spool", "", "Override path to spool")
+ logPath = flag.String("log", "", "Override path to logfile")
+ quiet = flag.Bool("quiet", false, "Print only errors")
+ debug = flag.Bool("debug", false, "Print debug messages")
+ version = flag.Bool("version", false, "Print version information")
+ warranty = flag.Bool("warranty", false, "Print warranty information")
)
flag.Usage = usage
flag.Parse()
fmt.Println(nncp.VersionGet())
return
}
- if *niceRaw < 1 || *niceRaw > 255 {
- log.Fatalln("-nice must be between 1 and 255")
+ nice, err := nncp.NicenessParse(*niceRaw)
+ if err != nil {
+ log.Fatalln(err)
}
- nice := uint8(*niceRaw)
if *doRx && *doTx {
log.Fatalln("-rx and -tx can not be set simultaneously")
}
log.Fatalln("At least one of -rx and -tx must be specified")
}
- cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
- if err != nil {
- log.Fatalln("Can not read config:", err)
- }
- ctx, err := nncp.CfgParse(cfgRaw)
+ ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
if err != nil {
- log.Fatalln("Can not parse config:", err)
+ log.Fatalln("Error during initialization:", err)
}
- ctx.Quiet = *quiet
- ctx.Debug = *debug
nodeIds := make(map[nncp.NodeId]struct{}, flag.NArg())
for i := 0; i < flag.NArg(); i++ {
continue
}
if err = tarWr.WriteHeader(&tar.Header{
+ Format: tar.FormatUSTAR,
+ Name: nncp.NNCPBundlePrefix,
+ Mode: 0700,
+ Typeflag: tar.TypeDir,
+ }); err != nil {
+ log.Fatalln("Error writing tar header:", err)
+ }
+ if err = tarWr.WriteHeader(&tar.Header{
+ Format: tar.FormatPAX,
Name: strings.Join([]string{
nncp.NNCPBundlePrefix,
nodeId.String(),
ctx.SelfId.String(),
pktName,
}, "/"),
- Mode: 0440,
+ Mode: 0400,
Size: job.Size,
Typeflag: tar.TypeReg,
}); err != nil {
}
continue
}
+ if entry.Typeflag != tar.TypeDir {
+ ctx.LogD("nncp-bundle", sds, "Expected NNCP/")
+ continue
+ }
+ entry, err = tarR.Next()
+ if err != nil {
+ if err != io.EOF {
+ ctx.LogD(
+ "nncp-bundle",
+ nncp.SdsAdd(sds, nncp.SDS{"err": err}),
+ "error reading tar",
+ )
+ }
+ continue
+ }
sds["pkt"] = entry.Name
if entry.Size < nncp.PktEncOverhead {
ctx.LogD("nncp-bundle", sds, "Too small packet")
ctx.LogD("nncp-bundle", sds, "Bad packet structure")
continue
}
- if pktEnc.Magic != nncp.MagicNNCPEv2 {
+ if pktEnc.Magic != nncp.MagicNNCPEv4 {
ctx.LogD("nncp-bundle", sds, "Bad packet magic number")
continue
}
}
if nncp.ToBase32(hsh.Sum(nil)) == pktName {
ctx.LogI("nncp-bundle", sds, "removed")
- os.Remove(dstPath)
+ if !*dryRun {
+ os.Remove(dstPath)
+ }
} else {
ctx.LogE("nncp-bundle", sds, "bad checksum")
}
ctx.LogD("nncp-bundle", sds, "Packet already exists")
continue
}
- if _, err = os.Stat(dstPath + nncp.SeenPostfix); err == nil || !os.IsNotExist(err) {
+ if _, err = os.Stat(dstPath + nncp.SeenSuffix); err == nil || !os.IsNotExist(err) {
ctx.LogD("nncp-bundle", sds, "Packet already exists")
continue
}
if *doCheck {
- tmp, err := ctx.NewTmpFileWHash()
- if err != nil {
- log.Fatalln("Error during temporary file creation:", err)
- }
- if _, err = tmp.W.Write(pktEncBuf); err != nil {
- log.Fatalln("Error during writing:", err)
- }
- if _, err = io.Copy(tmp.W, tarR); 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 err = tmp.Commit(selfPath); err != nil {
- log.Fatalln("Error during commiting:", err)
+ if *dryRun {
+ hsh, err := blake2b.New256(nil)
+ if err != nil {
+ log.Fatalln("Error during hasher creation:", err)
+ }
+ if _, err = hsh.Write(pktEncBuf); err != nil {
+ log.Fatalln("Error during writing:", err)
+ }
+ if _, err = io.Copy(hsh, tarR); err != nil {
+ log.Fatalln("Error during copying:", err)
+ }
+ if nncp.ToBase32(hsh.Sum(nil)) != pktName {
+ ctx.LogE("nncp-bundle", sds, "bad checksum")
+ continue
}
} else {
- ctx.LogE("nncp-bundle", sds, "bad checksum")
- tmp.Cancel()
- continue
+ tmp, err := ctx.NewTmpFileWHash()
+ if err != nil {
+ log.Fatalln("Error during temporary file creation:", err)
+ }
+ if _, err = tmp.W.Write(pktEncBuf); err != nil {
+ log.Fatalln("Error during writing:", err)
+ }
+ if _, err = io.Copy(tmp.W, tarR); 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 err = tmp.Commit(selfPath); err != nil {
+ log.Fatalln("Error during commiting:", err)
+ }
+ } else {
+ ctx.LogE("nncp-bundle", sds, "bad checksum")
+ tmp.Cancel()
+ continue
+ }
}
} else {
- tmp, err := ctx.NewTmpFile()
- if err != nil {
- log.Fatalln("Error during temporary file creation:", err)
- }
- bufTmp := bufio.NewWriterSize(tmp, CopyBufSize)
- if _, err = bufTmp.Write(pktEncBuf); err != nil {
- log.Fatalln("Error during writing:", err)
- }
- if _, err = io.Copy(bufTmp, tarR); err != nil {
- log.Fatalln("Error during copying:", err)
- }
- if err = bufTmp.Flush(); err != nil {
- log.Fatalln("Error during flushing:", err)
- }
- tmp.Sync()
- tmp.Close()
- if err = os.MkdirAll(selfPath, os.FileMode(0700)); err != nil {
- log.Fatalln("Error during mkdir:", err)
- }
- if err = os.Rename(tmp.Name(), dstPath); err != nil {
- log.Fatalln("Error during renaming:", err)
+ if *dryRun {
+ if _, err = io.Copy(ioutil.Discard, tarR); err != nil {
+ log.Fatalln("Error during copying:", err)
+ }
+ } else {
+ tmp, err := ctx.NewTmpFile()
+ if err != nil {
+ log.Fatalln("Error during temporary file creation:", err)
+ }
+ bufTmp := bufio.NewWriterSize(tmp, CopyBufSize)
+ if _, err = bufTmp.Write(pktEncBuf); err != nil {
+ log.Fatalln("Error during writing:", err)
+ }
+ if _, err = io.Copy(bufTmp, tarR); err != nil {
+ log.Fatalln("Error during copying:", err)
+ }
+ if err = bufTmp.Flush(); err != nil {
+ log.Fatalln("Error during flushing:", err)
+ }
+ if err = tmp.Sync(); err != nil {
+ log.Fatalln("Error during syncing:", err)
+ }
+ tmp.Close()
+ if err = os.MkdirAll(selfPath, os.FileMode(0700)); err != nil {
+ log.Fatalln("Error during mkdir:", err)
+ }
+ if err = os.Rename(tmp.Name(), dstPath); err != nil {
+ log.Fatalln("Error during renaming:", err)
+ }
}
}
ctx.LogI("nncp-bundle", nncp.SdsAdd(sds, nncp.SDS{