/*
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"
- "go.cypherpunks.ru/nncp/v4"
+ "go.cypherpunks.ru/nncp/v5"
)
func usage() {
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 {
} else {
addrs = append(addrs, *call.Addr)
}
- sds := nncp.SDS{"node": node.Id, "callindex": strconv.Itoa(i)}
+ sds := nncp.SDS{"node": node.Id, "callindex": i}
for {
n := time.Now()
t := call.Cron.Next(n)
ctx.LogD("caller", sds, t.String())
if t.IsZero() {
- ctx.LogE("caller", sds, "got zero time")
+ ctx.LogE("caller", sds, errors.New("got zero time"), "")
return
}
time.Sleep(t.Sub(n))