X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-call%2Fmain.go;h=077a907fdcd45761de28ac2bcf1629415bcb954f;hb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;hp=0072e982e22345fe250e49edb0e0dfdfca2644e1;hpb=1d2ce674b042d07fd9b37a46578c8b62bb0345b7;p=nncp.git

diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go
index 0072e98..077a907 100644
--- a/src/cmd/nncp-call/main.go
+++ b/src/cmd/nncp-call/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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
@@ -24,8 +24,9 @@ import (
 	"log"
 	"os"
 	"strings"
+	"time"
 
-	"go.cypherpunks.ru/nncp/v5"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -39,10 +40,12 @@ func usage() {
 func main() {
 	var (
 		cfgPath     = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+		ucspi       = flag.Bool("ucspi", false, "Is it started as UCSPI-TCP client")
 		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")
+		noCK        = flag.Bool("nock", false, "Do no checksum checking")
 		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")
@@ -55,9 +58,18 @@ func main() {
 		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")
+		onlineDeadlineSec = flag.Uint("onlinedeadline", 0, "Override onlinedeadline option")
+		maxOnlineTimeSec  = flag.Uint("maxonlinetime", 0, "Override maxonlinetime option")
+
+		autoToss       = flag.Bool("autotoss", false, "Toss after call is finished")
+		autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create seen/ files during tossing")
+		autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing")
+		autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing")
+		autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing")
+		autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing")
+		autoTossNoArea = flag.Bool("autotoss-noarea", false, "Do not process \"area\" packets during tossing")
 	)
+	log.SetFlags(log.Lshortfile)
 	flag.Usage = usage
 	flag.Parse()
 	if *warranty {
@@ -105,11 +117,13 @@ func main() {
 		log.Fatalln("Node does not have online communication capability")
 	}
 
-	if *onlineDeadline == 0 {
-		onlineDeadline = &node.OnlineDeadline
+	onlineDeadline := node.OnlineDeadline
+	if *onlineDeadlineSec != 0 {
+		onlineDeadline = time.Duration(*onlineDeadlineSec) * time.Second
 	}
-	if *maxOnlineTime == 0 {
-		maxOnlineTime = &node.MaxOnlineTime
+	maxOnlineTime := node.MaxOnlineTime
+	if *maxOnlineTimeSec != 0 {
+		maxOnlineTime = time.Duration(*maxOnlineTimeSec) * time.Second
 	}
 
 	var xxOnly nncp.TRxTx
@@ -120,7 +134,9 @@ func main() {
 	}
 
 	var addrs []string
-	if flag.NArg() == 2 {
+	if *ucspi {
+		addrs = append(addrs, nncp.UCSPITCPClient)
+	} else if flag.NArg() == 2 {
 		addrs = append(addrs, flag.Arg(1))
 	} else if len(splitted) == 2 {
 		addr, known := ctx.Neigh[*node.Id].Addrs[splitted[1]]
@@ -139,7 +155,7 @@ func main() {
 		splitted = strings.Split(*onlyPktsRaw, ",")
 		onlyPkts = make(map[[32]byte]bool, len(splitted))
 		for _, pktIdRaw := range splitted {
-			pktId, err := nncp.FromBase32(pktIdRaw)
+			pktId, err := nncp.Base32Codec.DecodeString(pktIdRaw)
 			if err != nil {
 				log.Fatalln("Invalid packet specified: ", err)
 			}
@@ -150,18 +166,42 @@ func main() {
 	}
 
 	ctx.Umask()
-	if !ctx.CallNode(
+
+	var autoTossFinish chan struct{}
+	var autoTossBadCode chan bool
+	if *autoToss {
+		autoTossFinish, autoTossBadCode = ctx.AutoToss(
+			node.Id,
+			nice,
+			*autoTossDoSeen,
+			*autoTossNoFile,
+			*autoTossNoFreq,
+			*autoTossNoExec,
+			*autoTossNoTrns,
+			*autoTossNoArea,
+		)
+	}
+
+	badCode := !ctx.CallNode(
 		node,
 		addrs,
 		nice,
 		xxOnly,
 		*rxRate,
 		*txRate,
-		*onlineDeadline,
-		*maxOnlineTime,
+		onlineDeadline,
+		maxOnlineTime,
 		*listOnly,
+		*noCK,
 		onlyPkts,
-	) {
+	)
+
+	if *autoToss {
+		close(autoTossFinish)
+		badCode = (<-autoTossBadCode) || badCode
+	}
+	nncp.SPCheckerWg.Wait()
+	if badCode {
 		os.Exit(1)
 	}
 }