X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=blobdiff_plain;f=src%2Fcmd%2Fnncp-toss%2Fmain.go;fp=src%2Fcmd%2Fnncp-toss%2Fmain.go;h=24b50e26d243d92952a0f2a0cd08304ebe290d79;hp=6a960368143aa8bca59548a171d9972bbd755596;hb=a13dfe188901835b627b02e1fc25638f5c9f68d5;hpb=9edd0bca196b4a7722ee64c27a8a2864f0677ad8

diff --git a/src/cmd/nncp-toss/main.go b/src/cmd/nncp-toss/main.go
index 6a96036..24b50e2 100644
--- a/src/cmd/nncp-toss/main.go
+++ b/src/cmd/nncp-toss/main.go
@@ -30,7 +30,6 @@ import (
 )
 
 func usage() {
-	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()
@@ -50,6 +49,7 @@ func main() {
 		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")
+		genACK    = flag.Bool("gen-ack", false, "Generate 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")
@@ -110,15 +110,31 @@ func main() {
 			isBad = ctx.Toss(
 				node.Id,
 				nncp.TRx,
-				nice,
-				*dryRun, *doSeen, *noFile, *noFreq, *noExec, *noTrns, *noArea, *noACK,
+				&nncp.TossOpts{
+					Nice:   nice,
+					DoSeen: *doSeen,
+					NoFile: *noFile,
+					NoFreq: *noFreq,
+					NoExec: *noExec,
+					NoTrns: *noTrns,
+					NoArea: *noArea,
+					NoACK:  *noACK,
+					GenACK: *genACK,
+				},
 			) || isBad
 			if nodeId == *ctx.SelfId {
 				isBad = ctx.Toss(
 					node.Id,
 					nncp.TTx,
-					nice,
-					*dryRun, false, true, true, true, true, *noArea, *noACK,
+					&nncp.TossOpts{
+						Nice:   nice,
+						NoFile: true,
+						NoFreq: true,
+						NoExec: true,
+						NoTrns: true,
+						NoArea: *noArea,
+						NoACK:  *noACK,
+					},
 				) || isBad
 			}
 		}
@@ -150,15 +166,32 @@ func main() {
 		ctx.Toss(
 			nodeId,
 			nncp.TRx,
-			nice,
-			*dryRun, *doSeen, *noFile, *noFreq, *noExec, *noTrns, *noArea, *noACK,
+			&nncp.TossOpts{
+				Nice:   nice,
+				DryRun: *dryRun,
+				DoSeen: *doSeen,
+				NoFile: *noFile,
+				NoFreq: *noFreq,
+				NoExec: *noExec,
+				NoTrns: *noTrns,
+				NoArea: *noArea,
+				NoACK:  *noACK,
+				GenACK: *genACK,
+			},
 		)
 		if *nodeId == *ctx.SelfId {
 			ctx.Toss(
 				nodeId,
 				nncp.TTx,
-				nice,
-				*dryRun, false, true, true, true, true, *noArea, *noACK,
+				&nncp.TossOpts{
+					Nice:   nice,
+					NoFile: true,
+					NoFreq: true,
+					NoExec: true,
+					NoTrns: true,
+					NoArea: *noArea,
+					NoACK:  *noACK,
+				},
 			)
 		}
 	}