nncp-freq DST argument is optional

[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 64db25ada6acce7b6aadea531a1387432c95a658..da5268fbda69d63ac8f803ece6e73364d7802014 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
@@ -1,5 +1,5 @@
 /*
-NNCP -- Node-to-Node CoPy
+NNCP -- Node to Node copy, utilities for store-and-forward data exchange
 Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -25,6 +25,7 @@ import (
        "io/ioutil"
        "log"
        "os"
+       "path/filepath"
        "strings"
 
        "cypherpunks.ru/nncp"
@@ -33,15 +34,17 @@ import (
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
        fmt.Fprintln(os.Stderr, "nncp-freq -- send file request\n")
-       fmt.Fprintln(os.Stderr, "Usage: %s [options] NODE:SRC DST\nOptions:", 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.DefaultNiceMail, "Outbound packet niceness")
-               debug    = flag.Bool("debug", false, "Enable debugging information")
+               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")
        )
@@ -55,7 +58,7 @@ func main() {
                fmt.Println(nncp.VersionGet())
                return
        }
-       if flag.NArg() != 2 {
+       if flag.NArg() == 0 {
                usage()
                os.Exit(1)
        }
@@ -64,7 +67,7 @@ func main() {
        }
        nice := uint8(*niceRaw)
 
-       cfgRaw, err := ioutil.ReadFile(*cfgPath)
+       cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
        if err != nil {
                log.Fatalln("Can not read config:", err)
        }
@@ -72,6 +75,10 @@ func main() {
        if err != nil {
                log.Fatalln("Can not parse config:", err)
        }
+       if ctx.Self == nil {
+               log.Fatalln("Config lacks private keys")
+       }
+       ctx.Quiet = *quiet
        ctx.Debug = *debug
 
        splitted := strings.SplitN(flag.Arg(0), ":", 2)
@@ -84,7 +91,20 @@ func main() {
                log.Fatalln("Invalid NODE specified:", err)
        }
 
-       if err = ctx.TxFreq(node, nice, splitted[1], flag.Arg(1)); 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)
        }
 }