X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-caller%2Fmain.go;h=3eff4d2a99a2fff62367d43b2b3d4abd25795c5a;hb=2e22bda93fdf8f2f84e4d19b3f1d46318b497139;hp=690244141eaf87e151112c3822b7c8ff9c637ff0;hpb=42e1e7c0aa2d75052c8e0b7a18bb7f0dfaa4c756;p=nncp.git

diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go
index 6902441..3eff4d2 100644
--- a/src/cmd/nncp-caller/main.go
+++ b/src/cmd/nncp-caller/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 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
@@ -33,8 +33,7 @@ import (
 )
 
 func usage() {
-	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-	fmt.Fprintf(os.Stderr, "nncp-caller -- croned NNCP TCP daemon caller\n\n")
+	fmt.Fprint(os.Stderr, "nncp-caller -- croned NNCP TCP daemon caller\n\n")
 	fmt.Fprintf(os.Stderr, "Usage: %s [options] [NODE ...]\n", os.Args[0])
 	fmt.Fprintln(os.Stderr, "Options:")
 	flag.PrintDefaults()
@@ -52,13 +51,24 @@ func main() {
 		version   = flag.Bool("version", false, "Print version information")
 		warranty  = flag.Bool("warranty", false, "Print warranty information")
 
-		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")
+		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")
+		autoTossNoACK = flag.Bool("autotoss-noack", false,
+			"Do not process \"ack\" packets during tossing")
+		autoTossGenACK = flag.Bool("autotoss-gen-ack", false,
+			"Generate ACK packets")
 	)
 	log.SetFlags(log.Lshortfile)
 	flag.Usage = usage
@@ -212,13 +222,17 @@ func main() {
 						if call.AutoToss || *autoToss {
 							autoTossFinish, autoTossBadCode = ctx.AutoToss(
 								node.Id,
-								call.Nice,
-								call.AutoTossDoSeen || *autoTossDoSeen,
-								call.AutoTossNoFile || *autoTossNoFile,
-								call.AutoTossNoFreq || *autoTossNoFreq,
-								call.AutoTossNoExec || *autoTossNoExec,
-								call.AutoTossNoTrns || *autoTossNoTrns,
-								call.AutoTossNoArea || *autoTossNoArea,
+								&nncp.TossOpts{
+									Nice:   call.Nice,
+									DoSeen: call.AutoTossDoSeen || *autoTossDoSeen,
+									NoFile: call.AutoTossNoFile || *autoTossNoFile,
+									NoFreq: call.AutoTossNoFreq || *autoTossNoFreq,
+									NoExec: call.AutoTossNoExec || *autoTossNoExec,
+									NoTrns: call.AutoTossNoTrns || *autoTossNoTrns,
+									NoArea: call.AutoTossNoArea || *autoTossNoArea,
+									NoACK:  call.AutoTossNoACK || *autoTossNoACK,
+									GenACK: call.AutoTossGenACK || *autoTossGenACK,
+								},
 							)
 						}