import (
"flag"
"fmt"
- "io/ioutil"
"log"
"os"
+ "path/filepath"
"strings"
"cypherpunks.ru/nncp"
func usage() {
fmt.Fprintf(os.Stderr, nncp.UsageHeader())
fmt.Fprintln(os.Stderr, "nncp-freq -- send file request\n")
- fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE:SRC DST\nOptions:\n", os.Args[0])
+ fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE:SRC [DST]\nOptions:\n", os.Args[0])
flag.PrintDefaults()
}
func main() {
var (
- cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
- niceRaw = flag.Int("nice", nncp.DefaultNiceFreq, "Outbound packet niceness")
- minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size")
- 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.Int("nice", nncp.DefaultNiceFreq, "Outbound packet niceness")
+ minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB")
+ 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 flag.NArg() != 2 {
+ if flag.NArg() == 0 {
usage()
os.Exit(1)
}
}
nice := uint8(*niceRaw)
- cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
+ ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
if err != nil {
- log.Fatalln("Can not read config:", err)
- }
- ctx, err := nncp.CfgParse(cfgRaw)
- if err != nil {
- log.Fatalln("Can not parse config:", err)
+ log.Fatalln("Error during initialization:", err)
}
if ctx.Self == nil {
log.Fatalln("Config lacks private keys")
}
- ctx.Quiet = *quiet
- ctx.Debug = *debug
splitted := strings.SplitN(flag.Arg(0), ":", 2)
if len(splitted) != 2 {
log.Fatalln("Invalid NODE specified:", err)
}
- if err = ctx.TxFreq(node, nice, splitted[1], flag.Arg(1), int64(*minSize)); err != nil {
+ var dst string
+ if flag.NArg() == 2 {
+ dst = flag.Arg(1)
+ } else {
+ dst = filepath.Base(splitted[1])
+ }
+
+ if err = ctx.TxFreq(
+ node,
+ nice,
+ splitted[1],
+ dst,
+ int64(*minSize)*1024,
+ ); err != nil {
log.Fatalln(err)
}
}