Raise copyright years

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

diff --git a/src/cmd/nncp-check/main.go b/src/cmd/nncp-check/main.go
index 186357ee3d458698d8993aa4fb664e34df6741db..2c9eafb4b6a5469b6b77516bf439b9542663ec9b 100644 (file)
--- a/src/cmd/nncp-check/main.go
+++ b/src/cmd/nncp-check/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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,28 +23,35 @@ 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-check -- verify Rx/Tx packets checksum\n\n")
-       fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "Usage: %s [-nock] [options]\nOptions:\n", os.Args[0])
        flag.PrintDefaults()
 }
 
 func main() {
        var (
+               nock      = flag.Bool("nock", false, "Process .nock files")
+               cycle     = flag.Uint("cycle", 0, "Repeat check after N seconds in infinite loop")
                cfgPath   = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
                nodeRaw   = flag.String("node", "", "Process only that node")
                spoolPath = flag.String("spool", "", "Override path to spool")
                logPath   = flag.String("log", "", "Override path to logfile")
                quiet     = flag.Bool("quiet", false, "Print only errors")
+               showPrgrs = flag.Bool("progress", false, "Force progress showing")
+               omitPrgrs = flag.Bool("noprogress", false, "Omit progress showing")
                debug     = flag.Bool("debug", false, "Print debug messages")
                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 {
@@ -56,7 +63,15 @@ func main() {
                return
        }
 
-       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
+       ctx, err := nncp.CtxFromCmdline(
+               *cfgPath,
+               *spoolPath,
+               *logPath,
+               *quiet,
+               *showPrgrs,
+               *omitPrgrs,
+               *debug,
+       )
        if err != nil {
                log.Fatalln("Error during initialization:", err)
        }
@@ -70,15 +85,33 @@ func main() {
                }
        }
 
+Cycle:
        isBad := false
        for nodeId, node := range ctx.Neigh {
                if nodeOnly != nil && nodeId != *nodeOnly.Id {
                        continue
                }
-               if !ctx.Check(node.Id) {
+               if *nock {
+                       for job := range ctx.JobsNoCK(node.Id) {
+                               if _, err = ctx.CheckNoCK(node.Id, job.HshValue, nil); err != nil {
+                                       pktName := nncp.Base32Codec.EncodeToString(job.HshValue[:])
+                                       log.Println(filepath.Join(
+                                               ctx.Spool,
+                                               nodeId.String(),
+                                               string(nncp.TRx),
+                                               pktName+nncp.NoCKSuffix,
+                                       ), err)
+                                       isBad = true
+                               }
+                       }
+               } else if !ctx.Check(node.Id) {
                        isBad = true
                }
        }
+       if *cycle > 0 {
+               time.Sleep(time.Duration(*cycle) * time.Second)
+               goto Cycle
+       }
        if isBad {
                os.Exit(1)
        }