Remove huge usage headers, -warranty exists anyway

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

diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go
index e338ac95b5febdc887ef40c00dbcffb8cee09199..e1e10f78729babb23f3b2023ea527b6947c299e9 100644 (file)
--- a/src/cmd/nncp-caller/main.go
+++ b/src/cmd/nncp-caller/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 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,16 +23,17 @@ import (
        "flag"
        "fmt"
        "log"
+       "net"
        "os"
+       "regexp"
        "sync"
        "time"
 
-       "go.cypherpunks.ru/nncp/v6"
+       "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
-       fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintf(os.Stderr, "nncp-caller -- croned NNCP TCP daemon caller\n\n")
+       fmt.Fprint(os.Stderr, "nncp-caller -- croned NNCP TCP daemon caller\n\n")
        fmt.Fprintf(os.Stderr, "Usage: %s [options] [NODE ...]\n", os.Args[0])
        fmt.Fprintln(os.Stderr, "Options:")
        flag.PrintDefaults()
@@ -51,11 +52,13 @@ func main() {
                warranty  = flag.Bool("warranty", false, "Print warranty information")
 
                autoToss       = flag.Bool("autotoss", false, "Toss after call is finished")
-               autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create .seen files during tossing")
+               autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create seen/ files during tossing")
                autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing")
                autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing")
                autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing")
                autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing")
+               autoTossNoArea = flag.Bool("autotoss-noarea", false, "Do not process \"area\" packets during tossing")
+               autoTossNoACK  = flag.Bool("autotoss-noack", false, "Do not process \"ack\" packets during tossing")
        )
        log.SetFlags(log.Lshortfile)
        flag.Usage = usage
@@ -93,6 +96,9 @@ func main() {
                        if err != nil {
                                log.Fatalln("Invalid NODE specified:", err)
                        }
+                       if node.NoisePub == nil {
+                               log.Fatalln("Node", nodeId, "does not have online communication capability")
+                       }
                        if len(node.Calls) == 0 {
                                ctx.LogD(
                                        "caller-no-calls",
@@ -121,9 +127,21 @@ func main() {
                }
        }
 
-       for _, ifiName := range ctx.MCDRxIfis {
-               if err = ctx.MCDRx(ifiName); err != nil {
-                       log.Fatalln("Can not run MCD reception:", err)
+       ifis, err := net.Interfaces()
+       if err != nil {
+               log.Fatalln("Can not get network interfaces list:", err)
+       }
+       for _, ifiReString := range ctx.MCDRxIfis {
+               ifiRe, err := regexp.CompilePOSIX(ifiReString)
+               if err != nil {
+                       log.Fatalf("Can not compile POSIX regexp \"%s\": %s", ifiReString, err)
+               }
+               for _, ifi := range ifis {
+                       if ifiRe.MatchString(ifi.Name) {
+                               if err = ctx.MCDRx(ifi.Name); err != nil {
+                                       log.Printf("Can not run MCD reception on %s: %s", ifi.Name, err)
+                               }
+                       }
                }
        }
 
@@ -194,12 +212,16 @@ func main() {
                                                if call.AutoToss || *autoToss {
                                                        autoTossFinish, autoTossBadCode = ctx.AutoToss(
                                                                node.Id,
-                                                               call.Nice,
-                                                               call.AutoTossDoSeen || *autoTossDoSeen,
-                                                               call.AutoTossNoFile || *autoTossNoFile,
-                                                               call.AutoTossNoFreq || *autoTossNoFreq,
-                                                               call.AutoTossNoExec || *autoTossNoExec,
-                                                               call.AutoTossNoTrns || *autoTossNoTrns,
+                                                               &nncp.TossOpts{
+                                                                       Nice:   call.Nice,
+                                                                       DoSeen: call.AutoTossDoSeen || *autoTossDoSeen,
+                                                                       NoFile: call.AutoTossNoFile || *autoTossNoFile,
+                                                                       NoFreq: call.AutoTossNoFreq || *autoTossNoFreq,
+                                                                       NoExec: call.AutoTossNoExec || *autoTossNoExec,
+                                                                       NoTrns: call.AutoTossNoTrns || *autoTossNoTrns,
+                                                                       NoArea: call.AutoTossNoArea || *autoTossNoArea,
+                                                                       NoACK:  call.AutoTossNoACK || *autoTossNoACK,
+                                                               },
                                                        )
                                                }
 
@@ -244,4 +266,5 @@ func main() {
                }
        }
        wg.Wait()
+       nncp.SPCheckerWg.Wait()
 }