/*
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
"fmt"
"log"
"os"
+ "path/filepath"
"time"
- "go.cypherpunks.ru/nncp/v4"
+ "go.cypherpunks.ru/nncp/v7"
)
func usage() {
nodeRaw = flag.String("node", "", "Process only that node")
niceRaw = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness")
dryRun = flag.Bool("dryrun", false, "Do not actually write any tossed data")
- doSeen = flag.Bool("seen", false, "Create .seen files")
+ doSeen = flag.Bool("seen", false, "Create seen/ files")
cycle = flag.Uint("cycle", 0, "Repeat tossing after N seconds in infinite loop")
- noFile = flag.Bool("nofile", false, "Do not process packets with type: file")
- noFreq = flag.Bool("nofreq", false, "Do not process packets with type: freq")
- noExec = flag.Bool("noexec", false, "Do not process packets with type: exec")
- noTrns = flag.Bool("notrns", false, "Do not process packets with type: transitional")
+ noFile = flag.Bool("nofile", false, "Do not process \"file\" packets")
+ noFreq = flag.Bool("nofreq", false, "Do not process \"freq\" packets")
+ noExec = flag.Bool("noexec", false, "Do not process \"exec\" packets")
+ noTrns = flag.Bool("notrns", false, "Do not process \"transitional\" packets")
+ noArea = flag.Bool("noarea", false, "Do not process \"area\" packets")
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.SetFlags(log.Lshortfile)
flag.Usage = usage
flag.Parse()
if *warranty {
log.Fatalln(err)
}
- 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)
}
}
}
-Cycle:
- isBad := false
+ ctx.Umask()
+
+ if *cycle == 0 {
+ isBad := false
+ for nodeId, node := range ctx.Neigh {
+ if nodeOnly != nil && nodeId != *nodeOnly.Id {
+ continue
+ }
+ isBad = ctx.Toss(
+ node.Id,
+ nncp.TRx,
+ nice,
+ *dryRun, *doSeen, *noFile, *noFreq, *noExec, *noTrns, *noArea,
+ ) || isBad
+ if nodeId == *ctx.SelfId {
+ isBad = ctx.Toss(
+ node.Id,
+ nncp.TTx,
+ nice,
+ *dryRun, false, true, true, true, true, *noArea,
+ ) || isBad
+ }
+ }
+ if isBad {
+ os.Exit(1)
+ }
+ return
+ }
+
+ nodeIds := make(chan *nncp.NodeId)
for nodeId, node := range ctx.Neigh {
if nodeOnly != nil && nodeId != *nodeOnly.Id {
continue
}
- isBad = ctx.Toss(
- node.Id,
- nice,
- *dryRun,
- *doSeen,
- *noFile,
- *noFreq,
- *noExec,
- *noTrns,
+ dw, err := ctx.NewDirWatcher(
+ filepath.Join(ctx.Spool, node.Id.String(), string(nncp.TRx)),
+ time.Second*time.Duration(*cycle),
)
+ if err != nil {
+ log.Fatalln(err)
+ }
+ go func(nodeId *nncp.NodeId) {
+ for range dw.C {
+ nodeIds <- nodeId
+ }
+ }(node.Id)
}
- if *cycle > 0 {
- time.Sleep(time.Duration(*cycle) * time.Second)
- goto Cycle
- }
- if isBad {
- os.Exit(1)
+ for nodeId := range nodeIds {
+ ctx.Toss(
+ nodeId,
+ nncp.TRx,
+ nice,
+ *dryRun, *doSeen, *noFile, *noFreq, *noExec, *noTrns, *noArea,
+ )
+ if *nodeId == *ctx.SelfId {
+ ctx.Toss(
+ nodeId,
+ nncp.TTx,
+ nice,
+ *dryRun, false, true, true, true, true, *noArea,
+ )
+ }
}
}