Generate ACKs during tossing

[nncp.git] / src / cmd / nncp-ack / main.go

diff --git a/src/cmd/nncp-ack/main.go b/src/cmd/nncp-ack/main.go
index 950295a7d81029f7b8b4dfc11815b454d0ea4d42..18a6f4be359e26bb9be55b5394b982c0fbc5bb31 100644 (file)
--- a/src/cmd/nncp-ack/main.go
+++ b/src/cmd/nncp-ack/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
@@ -34,20 +34,20 @@ import (
 )
 
 func usage() {
-       fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintf(os.Stderr, "nncp-ack -- send packet receipt acknowledgement\n\n")
+       fmt.Fprint(os.Stderr, "nncp-ack -- send packet receipt acknowledgement\n\n")
        fmt.Fprintf(os.Stderr, "Usage: %s [options] -all\n", os.Args[0])
-       fmt.Fprintf(os.Stderr, "Usage: %s           -node NODE[,...]\n", os.Args[0])
-       fmt.Fprintf(os.Stderr, "Usage: %s           -node NODE -pkt PKT\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "Usage: %s [options] -node NODE[,...]\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "Usage: %s [options] -node NODE -pkt PKT\n", os.Args[0])
        fmt.Fprintln(os.Stderr, "Options:")
        flag.PrintDefaults()
 }
 
 func main() {
        var (
-               cfgPath     = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-               niceRaw     = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFreq), "Outbound packet niceness")
-               minSizeRaw  = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB")
+               cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+               niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFreq),
+                       "Outbound packet niceness")
+               minSizeRaw  = flag.Int64("minsize", -1, "Minimal required resulting packet size, in KiB")
                viaOverride = flag.String("via", "", "Override Via path to destination node (ignored with -all)")
                spoolPath   = flag.String("spool", "", "Override path to spool")
                logPath     = flag.String("log", "", "Override path to logfile")
@@ -94,7 +94,6 @@ func main() {
        }
 
        ctx.Umask()
-       minSize := int64(*minSizeRaw) * 1024
 
        var nodes []*nncp.Node
        if *nodesRaw != "" {
@@ -119,20 +118,41 @@ func main() {
                os.Exit(1)
        }
 
+       acksCreated := os.NewFile(uintptr(4), "ACKsCreated")
+       if acksCreated == nil {
+               log.Fatalln("can not open FD:4")
+       }
+
        if *pktRaw != "" {
                if len(nodes) != 1 {
                        usage()
                        os.Exit(1)
                }
                nncp.ViaOverride(*viaOverride, ctx, nodes[0])
-               if err = ctx.TxACK(nodes[0], nice, *pktRaw, minSize); err != nil {
+
+               var minSize int64
+               if *minSizeRaw < 0 {
+                       minSize = nodes[0].ACKMinSize
+               } else if *minSizeRaw > 0 {
+                       minSize = *minSizeRaw * 1024
+               }
+
+               pktName, err := ctx.TxACK(nodes[0], nice, *pktRaw, minSize)
+               if err != nil {
                        log.Fatalln(err)
                }
+               acksCreated.WriteString(nodes[0].Id.String() + "/" + pktName + "\n")
                return
        }
 
        isBad := false
        for _, node := range nodes {
+               var minSize int64
+               if *minSizeRaw < 0 {
+                       minSize = node.ACKMinSize
+               } else if *minSizeRaw > 0 {
+                       minSize = *minSizeRaw * 1024
+               }
                for job := range ctx.Jobs(node.Id, nncp.TRx) {
                        pktName := filepath.Base(job.Path)
                        sender := ctx.Neigh[*job.PktEnc.Sender]
@@ -199,7 +219,12 @@ func main() {
                                continue
                        }
                        pipeR, pipeW := io.Pipe()
-                       go nncp.PktEncRead(ctx.Self, ctx.Neigh, bufio.NewReader(fd), pipeW, true, nil)
+                       go nncp.PktEncRead(
+                               ctx.Self,
+                               ctx.Neigh,
+                               bufio.NewReaderSize(fd, nncp.MTHBlockSize),
+                               pipeW, true, nil,
+                       )
                        var pkt nncp.Pkt
                        _, err = xdr.Unmarshal(pipeR, &pkt)
                        fd.Close()
@@ -217,9 +242,11 @@ func main() {
                                })
                                continue
                        }
-                       if err = ctx.TxACK(node, nice, pktName, minSize); err != nil {
+                       newPktName, err := ctx.TxACK(node, nice, pktName, minSize)
+                       if err != nil {
                                log.Fatalln(err)
                        }
+                       acksCreated.WriteString(node.Id.String() + "/" + newPktName + "\n")
                }
        }
        if isBad {