Forbid any later GNU GPL versions autousage

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

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-call/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-call/main.go
index bbf9bfa2ff3671c63502cc117af56dc67377d0a3..ede5a4864208c7ae72fd9873a366d0bbdf1a42c6 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-call/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-call/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/>.
 */
 
-// Call NNCP TCP daemon
+// Call NNCP TCP daemon.
 package main
 
 import (
@@ -39,16 +38,20 @@ func usage() {
 
 func main() {
        var (
-               cfgPath   = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-               niceRaw   = flag.Int("nice", 255, "Minimal required niceness")
-               rxOnly    = flag.Bool("rx", false, "Only receive packets")
-               txOnly    = flag.Bool("tx", false, "Only transfer packets")
-               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")
+               cfgPath     = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+               niceRaw     = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness")
+               rxOnly      = flag.Bool("rx", false, "Only receive packets")
+               txOnly      = flag.Bool("tx", false, "Only transmit packets")
+               listOnly    = flag.Bool("list", false, "Only list remote packets")
+               onlyPktsRaw = flag.String("pkts", "", "Recieve only that packets, comma separated")
+               rxRate      = flag.Int("rxrate", 0, "Maximal receive rate, pkts/sec")
+               txRate      = flag.Int("txrate", 0, "Maximal transmit rate, pkts/sec")
+               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")
 
                onlineDeadline = flag.Uint("onlinedeadline", 0, "Override onlinedeadline option")
                maxOnlineTime  = flag.Uint("maxonlinetime", 0, "Override maxonlinetime option")
@@ -67,10 +70,10 @@ 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 *rxOnly && *txOnly {
                log.Fatalln("-rx and -tx can not be set simultaneously")
        }
@@ -121,7 +124,33 @@ func main() {
                }
        }
 
-       if !ctx.CallNode(node, addrs, nice, xxOnly, *onlineDeadline, *maxOnlineTime) {
+       var onlyPkts map[[32]byte]bool
+       if len(*onlyPktsRaw) > 0 {
+               splitted = strings.Split(*onlyPktsRaw, ",")
+               onlyPkts = make(map[[32]byte]bool, len(splitted))
+               for _, pktIdRaw := range splitted {
+                       pktId, err := nncp.FromBase32(pktIdRaw)
+                       if err != nil {
+                               log.Fatalln("Invalid packet specified: ", err)
+                       }
+                       pktIdArr := new([32]byte)
+                       copy(pktIdArr[:], pktId)
+                       onlyPkts[*pktIdArr] = true
+               }
+       }
+
+       if !ctx.CallNode(
+               node,
+               addrs,
+               nice,
+               xxOnly,
+               *rxRate,
+               *txRate,
+               *onlineDeadline,
+               *maxOnlineTime,
+               *listOnly,
+               onlyPkts,
+       ) {
                os.Exit(1)
        }
 }