X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-toss%2Fmain.go;h=24b50e26d243d92952a0f2a0cd08304ebe290d79;hb=2e22bda93fdf8f2f84e4d19b3f1d46318b497139;hp=89b94d9515a7b1c5210974701026450abdcead22;hpb=271870ad4f56253e0918f673b90615e4749cf201;p=nncp.git

diff --git a/src/cmd/nncp-toss/main.go b/src/cmd/nncp-toss/main.go
index 89b94d9..24b50e2 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-2020 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
@@ -23,14 +23,14 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path/filepath"
 	"time"
 
-	"go.cypherpunks.ru/nncp/v5"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
-	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-	fmt.Fprintf(os.Stderr, "nncp-toss -- process inbound packets\n\n")
+	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()
 }
@@ -41,12 +41,15 @@ func main() {
 		nodeRaw   = flag.String("node", "", "Process only that node")
 		niceRaw   = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness")
 		dryRun    = flag.Bool("dryrun", false, "Do not actually write any tossed data")
-		doSeen    = flag.Bool("seen", false, "Create .seen files")
+		doSeen    = flag.Bool("seen", false, "Create seen/ files")
 		cycle     = flag.Uint("cycle", 0, "Repeat tossing after N seconds in infinite loop")
-		noFile    = flag.Bool("nofile", false, "Do not process packets with type: file")
-		noFreq    = flag.Bool("nofreq", false, "Do not process packets with type: freq")
-		noExec    = flag.Bool("noexec", false, "Do not process packets with type: exec")
-		noTrns    = flag.Bool("notrns", false, "Do not process packets with type: transitional")
+		noFile    = flag.Bool("nofile", false, "Do not process \"file\" packets")
+		noFreq    = flag.Bool("nofreq", false, "Do not process \"freq\" packets")
+		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")
+		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")
@@ -56,6 +59,7 @@ func main() {
 		version   = flag.Bool("version", false, "Print version information")
 		warranty  = flag.Bool("warranty", false, "Print warranty information")
 	)
+	log.SetFlags(log.Lshortfile)
 	flag.Usage = usage
 	flag.Parse()
 	if *warranty {
@@ -97,28 +101,98 @@ func main() {
 
 	ctx.Umask()
 
-Cycle:
-	isBad := false
+	if *cycle == 0 {
+		isBad := false
+		for nodeId, node := range ctx.Neigh {
+			if nodeOnly != nil && nodeId != *nodeOnly.Id {
+				continue
+			}
+			isBad = ctx.Toss(
+				node.Id,
+				nncp.TRx,
+				&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,
+					&nncp.TossOpts{
+						Nice:   nice,
+						NoFile: true,
+						NoFreq: true,
+						NoExec: true,
+						NoTrns: true,
+						NoArea: *noArea,
+						NoACK:  *noACK,
+					},
+				) || isBad
+			}
+		}
+		if isBad {
+			os.Exit(1)
+		}
+		return
+	}
+
+	nodeIds := make(chan *nncp.NodeId)
 	for nodeId, node := range ctx.Neigh {
 		if nodeOnly != nil && nodeId != *nodeOnly.Id {
 			continue
 		}
-		isBad = ctx.Toss(
-			node.Id,
-			nice,
-			*dryRun,
-			*doSeen,
-			*noFile,
-			*noFreq,
-			*noExec,
-			*noTrns,
+		dw, err := ctx.NewDirWatcher(
+			filepath.Join(ctx.Spool, node.Id.String(), string(nncp.TRx)),
+			time.Second*time.Duration(*cycle),
 		)
+		if err != nil {
+			log.Fatalln(err)
+		}
+		go func(nodeId *nncp.NodeId) {
+			for range dw.C {
+				nodeIds <- nodeId
+			}
+		}(node.Id)
 	}
-	if *cycle > 0 {
-		time.Sleep(time.Duration(*cycle) * time.Second)
-		goto Cycle
-	}
-	if isBad {
-		os.Exit(1)
+	for nodeId := range nodeIds {
+		ctx.Toss(
+			nodeId,
+			nncp.TRx,
+			&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,
+				&nncp.TossOpts{
+					Nice:   nice,
+					NoFile: true,
+					NoFreq: true,
+					NoExec: true,
+					NoTrns: true,
+					NoArea: *noArea,
+					NoACK:  *noACK,
+				},
+			)
+		}
 	}
 }