Ability to disable relaying with -via - option

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

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
index 0b61aba057356d3cfbe1de1bfd7d3b9dedf989d1..e19eb9365463a52634e51231e1f734c8c925e71d 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-file/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,7 +22,6 @@ package main
 import (
        "flag"
        "fmt"
-       "io/ioutil"
        "log"
        "os"
        "strings"
@@ -32,24 +31,30 @@ import (
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintln(os.Stderr, "nncp-file -- send file\n")
+       fmt.Fprintf(os.Stderr, "nncp-file -- send file\n\n")
        fmt.Fprintf(os.Stderr, "Usage: %s [options] SRC NODE:[DST]\nOptions:\n", os.Args[0])
        flag.PrintDefaults()
        fmt.Fprint(os.Stderr, `
 If SRC equals to -, then read data from stdin to temporary file.
+
+-minsize/-chunked take NODE's FreqMinSize/FreqChunked configuration
+options by default. You can forcefully turn them off by specifying 0 value.
 `)
 }
 
 func main() {
        var (
-               cfgPath   = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-               niceRaw   = flag.Int("nice", nncp.DefaultNiceFile, "Outbound packet niceness")
-               minSize   = flag.Uint64("minsize", 0, "Minimal required resulting packet size")
-               chunkSize = flag.Uint64("chunked", 0, "Split file on specified size chunks, 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.DefaultNiceFile, "Outbound packet niceness")
+               argMinSize   = flag.Int64("minsize", -1, "Minimal required resulting packet size, in KiB")
+               argChunkSize = flag.Int64("chunked", -1, "Split file on specified size chunks, 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()
@@ -70,19 +75,13 @@ func main() {
        }
        nice := uint8(*niceRaw)
 
-       cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
-       if err != nil {
-               log.Fatalln("Can not read config:", err)
-       }
-       ctx, err := nncp.CfgParse(cfgRaw)
+       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(1), ":", 2)
        if len(splitted) != 2 {
@@ -94,16 +93,38 @@ func main() {
                log.Fatalln("Invalid NODE specified:", err)
        }
 
-       if *chunkSize == 0 {
-               err = ctx.TxFile(node, nice, flag.Arg(0), splitted[1], int64(*minSize))
+       nncp.ViaOverride(*viaOverride, ctx, node)
+
+       var minSize int64
+       if *argMinSize < 0 {
+               minSize = node.FreqMinSize
+       } else if *argMinSize > 0 {
+               minSize = *argMinSize * 1024
+       }
+
+       var chunkSize int64
+       if *argChunkSize < 0 {
+               chunkSize = node.FreqChunked
+       } else if *argChunkSize > 0 {
+               chunkSize = *argChunkSize * 1024
+       }
+
+       if chunkSize == 0 {
+               err = ctx.TxFile(
+                       node,
+                       nice,
+                       flag.Arg(0),
+                       splitted[1],
+                       minSize,
+               )
        } else {
                err = ctx.TxFileChunked(
                        node,
                        nice,
                        flag.Arg(0),
                        splitted[1],
-                       int64(*minSize),
-                       int64(*chunkSize)*1024,
+                       minSize,
+                       chunkSize,
                )
        }
        if err != nil {