/*
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
package main
import (
+ "errors"
"flag"
"fmt"
"log"
"os"
- "strconv"
"sync"
"time"
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")
return
}
- 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)
}
if ctx.Self == nil {
log.Fatalln("Config lacks private keys")
}
+ ctx.Umask()
var nodes []*nncp.Node
if flag.NArg() > 0 {
log.Fatalln("Invalid NODE specified:", err)
}
if len(node.Calls) == 0 {
- ctx.LogD("caller", nncp.SDS{"node": node.Id}, "has no calls, skipping")
+ ctx.LogD("caller", nncp.LEs{{K: "Node", V: node.Id}}, "has no calls, skipping")
continue
}
nodes = append(nodes, node)
} else {
for _, node := range ctx.Neigh {
if len(node.Calls) == 0 {
- ctx.LogD("caller", nncp.SDS{"node": node.Id}, "has no calls, skipping")
+ ctx.LogD("caller", nncp.LEs{{K: "Node", V: node.Id}}, "has no calls, skipping")
continue
}
nodes = append(nodes, node)
} else {
addrs = append(addrs, *call.Addr)
}
- sds := nncp.SDS{"node": node.Id, "callindex": strconv.Itoa(i)}
+ les := nncp.LEs{{K: "Node", V: node.Id}, {K: "CallIndex", V: i}}
for {
n := time.Now()
t := call.Cron.Next(n)
- ctx.LogD("caller", sds, t.String())
+ ctx.LogD("caller", les, t.String())
if t.IsZero() {
- ctx.LogE("caller", sds, "got zero time")
+ ctx.LogE("caller", les, errors.New("got zero time"), "")
return
}
time.Sleep(t.Sub(n))
node.Lock()
if node.Busy {
node.Unlock()
- ctx.LogD("caller", sds, "busy")
+ ctx.LogD("caller", les, "busy")
continue
} else {
node.Busy = true
node.Unlock()
+
+ if call.WhenTxExists && call.Xx != "TRx" {
+ ctx.LogD("caller", les, "checking tx existence")
+ txExists := false
+ for job := range ctx.Jobs(node.Id, nncp.TTx) {
+ if job.PktEnc.Nice > call.Nice {
+ continue
+ }
+ txExists = true
+ }
+ if !txExists {
+ ctx.LogD("caller", les, "no tx")
+ node.Lock()
+ node.Busy = false
+ node.Unlock()
+ continue
+ }
+ }
+
+ var autoTossFinish chan struct{}
+ var autoTossBadCode chan bool
+ if call.AutoToss {
+ autoTossFinish, autoTossBadCode = ctx.AutoToss(
+ node.Id,
+ call.Nice,
+ call.AutoTossDoSeen,
+ call.AutoTossNoFile,
+ call.AutoTossNoFreq,
+ call.AutoTossNoExec,
+ call.AutoTossNoTrns,
+ )
+ }
+
ctx.CallNode(
node,
addrs,
false,
nil,
)
+
+ if call.AutoToss {
+ close(autoTossFinish)
+ <-autoTossBadCode
+ }
+
node.Lock()
node.Busy = false
node.Unlock()