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

diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go
index 5d632d4..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-2021 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
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"go.cypherpunks.ru/nncp/v7"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -40,6 +40,7 @@ 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")
@@ -61,11 +62,12 @@ func main() {
 		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")
+		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
@@ -132,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]]
@@ -174,6 +178,7 @@ func main() {
 			*autoTossNoFreq,
 			*autoTossNoExec,
 			*autoTossNoTrns,
+			*autoTossNoArea,
 		)
 	}