Ability to disable relaying with -via - option

[nncp.git] / src / cypherpunks.ru / nncp / cmd / nncp-freq / main.go

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
index 8318191009af9b45f265307a52d61ba34850c657..1c8e248cb60ce27a1f2c7e0be57566ad778a3b4d 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2018 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
@@ -22,9 +22,9 @@ package main
 import (
        "flag"
        "fmt"
-       "io/ioutil"
        "log"
        "os"
+       "path/filepath"
        "strings"
 
        "cypherpunks.ru/nncp"
@@ -32,20 +32,24 @@ import (
 
 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, "nncp-freq -- send file request\n\n")
+       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, in KiB")
-               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")
+               replyNiceRaw = flag.Int("replynice", nncp.DefaultNiceFile, "Reply file packet niceness")
+               minSize      = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB")
+               viaOverride  = flag.String("via", "", "Override Via path to destination node")
+               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()
@@ -57,7 +61,7 @@ func main() {
                fmt.Println(nncp.VersionGet())
                return
        }
-       if flag.NArg() != 2 {
+       if flag.NArg() == 0 {
                usage()
                os.Exit(1)
        }
@@ -65,20 +69,18 @@ func main() {
                log.Fatalln("-nice must be between 1 and 255")
        }
        nice := uint8(*niceRaw)
-
-       cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
-       if err != nil {
-               log.Fatalln("Can not read config:", err)
+       if *replyNiceRaw < 1 || *replyNiceRaw > 255 {
+               log.Fatalln("-replynice must be between 1 and 255")
        }
-       ctx, err := nncp.CfgParse(cfgRaw)
+       replyNice := uint8(*replyNiceRaw)
+
+       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)
        }
        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 {
@@ -90,11 +92,21 @@ func main() {
                log.Fatalln("Invalid NODE specified:", err)
        }
 
+       nncp.ViaOverride(*viaOverride, ctx, node)
+
+       var dst string
+       if flag.NArg() == 2 {
+               dst = flag.Arg(1)
+       } else {
+               dst = filepath.Base(splitted[1])
+       }
+
        if err = ctx.TxFreq(
                node,
                nice,
+               replyNice,
                splitted[1],
-               flag.Arg(1),
+               dst,
                int64(*minSize)*1024,
        ); err != nil {
                log.Fatalln(err)