Forbid any later GNU GPL versions autousage

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

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-exec/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-exec/main.go
index 8e7aec62682a1e3002d2557145ee33144273b044..c5a446cfbdbb39d3d629cf347060056ab0f82054 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-exec/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-exec/main.go
@@ -1,11 +1,10 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2018 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2019 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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// Send execution command via NNCP
+// Send execution command via NNCP.
 package main
 
 import (
@@ -26,7 +25,6 @@ import (
        "io/ioutil"
        "log"
        "os"
-       "strings"
 
        "cypherpunks.ru/nncp"
 )
@@ -41,8 +39,8 @@ func usage() {
 func main() {
        var (
                cfgPath      = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-               niceRaw      = flag.Int("nice", nncp.DefaultNiceExec, "Outbound packet niceness")
-               replyNiceRaw = flag.Int("replynice", nncp.DefaultNiceFile, "Possible reply packet niceness")
+               niceRaw      = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceExec), "Outbound packet niceness")
+               replyNiceRaw = flag.String("replynice", nncp.NicenessFmt(nncp.DefaultNiceFile), "Possible reply 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")
@@ -66,14 +64,14 @@ func main() {
                usage()
                os.Exit(1)
        }
-       if *niceRaw < 1 || *niceRaw > 255 {
-               log.Fatalln("-nice must be between 1 and 255")
+       nice, err := nncp.NicenessParse(*niceRaw)
+       if err != nil {
+               log.Fatalln(err)
        }
-       nice := uint8(*niceRaw)
-       if *replyNiceRaw < 1 || *replyNiceRaw > 255 {
-               log.Fatalln("-replynice must be between 1 and 255")
+       replyNice, err := nncp.NicenessParse(*replyNiceRaw)
+       if err != nil {
+               log.Fatalln(err)
        }
-       replyNice := uint8(*replyNiceRaw)
 
        ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
        if err != nil {
@@ -88,17 +86,7 @@ func main() {
                log.Fatalln("Invalid NODE specified:", err)
        }
 
-       if *viaOverride != "" {
-               vias := make([]*nncp.NodeId, 0, strings.Count(*viaOverride, ",")+1)
-               for _, via := range strings.Split(*viaOverride, ",") {
-                       foundNodeId, err := ctx.FindNode(via)
-                       if err != nil {
-                               log.Fatalln("Invalid Via node specified:", err)
-                       }
-                       vias = append(vias, foundNodeId.Id)
-               }
-               node.Via = vias
-       }
+       nncp.ViaOverride(*viaOverride, ctx, node)
 
        body, err := ioutil.ReadAll(bufio.NewReader(os.Stdin))
        if err != nil {