X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-toss%2Fmain.go;h=e2bf96844a82ea0d39714d0f0d7fd2cf9a6dbfe4;hb=ecfb8f586558e5d74913323b716d208a1a6b422e;hp=4eca181635d2281eef161407fed31e93dd347214;hpb=128618d02d84d08164060f14e7fdd3b87e491fcb;p=nncp.git

diff --git a/src/cmd/nncp-toss/main.go b/src/cmd/nncp-toss/main.go
index 4eca181..e2bf968 100644
--- a/src/cmd/nncp-toss/main.go
+++ b/src/cmd/nncp-toss/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
@@ -30,8 +30,8 @@ import (
 )
 
 func usage() {
-	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-	fmt.Fprintf(os.Stderr, "nncp-toss -- process inbound packets\n\n")
+	fmt.Fprint(os.Stderr, nncp.UsageHeader())
+	fmt.Fprint(os.Stderr, "nncp-toss -- process inbound packets\n\n")
 	fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
 }
@@ -49,6 +49,7 @@ func main() {
 		noExec    = flag.Bool("noexec", false, "Do not process \"exec\" packets")
 		noTrns    = flag.Bool("notrns", false, "Do not process \"transitional\" packets")
 		noArea    = flag.Bool("noarea", false, "Do not process \"area\" packets")
+		noACK     = flag.Bool("noack", false, "Do not process \"ack\" 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")
@@ -109,15 +110,30 @@ func main() {
 			isBad = ctx.Toss(
 				node.Id,
 				nncp.TRx,
-				nice,
-				*dryRun, *doSeen, *noFile, *noFreq, *noExec, *noTrns, *noArea,
+				&nncp.TossOpts{
+					Nice:   nice,
+					DoSeen: *doSeen,
+					NoFile: *noFile,
+					NoFreq: *noFreq,
+					NoExec: *noExec,
+					NoTrns: *noTrns,
+					NoArea: *noArea,
+					NoACK:  *noACK,
+				},
 			) || isBad
 			if nodeId == *ctx.SelfId {
 				isBad = ctx.Toss(
 					node.Id,
 					nncp.TTx,
-					nice,
-					*dryRun, false, true, true, true, true, *noArea,
+					&nncp.TossOpts{
+						Nice:   nice,
+						NoFile: true,
+						NoFreq: true,
+						NoExec: true,
+						NoTrns: true,
+						NoArea: *noArea,
+						NoACK:  *noACK,
+					},
 				) || isBad
 			}
 		}
@@ -149,15 +165,31 @@ func main() {
 		ctx.Toss(
 			nodeId,
 			nncp.TRx,
-			nice,
-			*dryRun, *doSeen, *noFile, *noFreq, *noExec, *noTrns, *noArea,
+			&nncp.TossOpts{
+				Nice:   nice,
+				DryRun: *dryRun,
+				DoSeen: *doSeen,
+				NoFile: *noFile,
+				NoFreq: *noFreq,
+				NoExec: *noExec,
+				NoTrns: *noTrns,
+				NoArea: *noArea,
+				NoACK:  *noACK,
+			},
 		)
 		if *nodeId == *ctx.SelfId {
 			ctx.Toss(
 				nodeId,
 				nncp.TTx,
-				nice,
-				*dryRun, false, true, true, true, true, *noArea,
+				&nncp.TossOpts{
+					Nice:   nice,
+					NoFile: true,
+					NoFreq: true,
+					NoExec: true,
+					NoTrns: true,
+					NoArea: *noArea,
+					NoACK:  *noACK,
+				},
 			)
 		}
 	}