-mcd-wait must not be enabled by default

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

diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go
index 3136e3e9221e8a11236addfc917b0a4be24ae1e4..82cec19987583b888932f6a25bed2259906a5b1c 100644 (file)
--- a/src/cmd/nncp-call/main.go
+++ b/src/cmd/nncp-call/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-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
@@ -22,11 +22,13 @@ import (
        "flag"
        "fmt"
        "log"
+       "net"
        "os"
+       "regexp"
        "strings"
        "time"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -40,12 +42,14 @@ func usage() {
 func main() {
        var (
                cfgPath     = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+               ucspi       = flag.Bool("ucspi", false, "Is it started as UCSPI-TCP client")
                niceRaw     = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness")
                rxOnly      = flag.Bool("rx", false, "Only receive packets")
                txOnly      = flag.Bool("tx", false, "Only transmit packets")
                listOnly    = flag.Bool("list", false, "Only list remote packets")
                noCK        = flag.Bool("nock", false, "Do no checksum checking")
                onlyPktsRaw = flag.String("pkts", "", "Recieve only that packets, comma separated")
+               mcdWait     = flag.Uint("mcd-wait", 0, "Wait for MCD for specified number of seconds")
                rxRate      = flag.Int("rxrate", 0, "Maximal receive rate, pkts/sec")
                txRate      = flag.Int("txrate", 0, "Maximal transmit rate, pkts/sec")
                spoolPath   = flag.String("spool", "", "Override path to spool")
@@ -61,12 +65,14 @@ func main() {
                maxOnlineTimeSec  = flag.Uint("maxonlinetime", 0, "Override maxonlinetime option")
 
                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")
        )
+       log.SetFlags(log.Lshortfile)
        flag.Usage = usage
        flag.Parse()
        if *warranty {
@@ -131,7 +137,9 @@ func main() {
        }
 
        var addrs []string
-       if flag.NArg() == 2 {
+       if *ucspi {
+               addrs = append(addrs, nncp.UCSPITCPClient)
+       } else if flag.NArg() == 2 {
                addrs = append(addrs, flag.Arg(1))
        } else if len(splitted) == 2 {
                addr, known := ctx.Neigh[*node.Id].Addrs[splitted[1]]
@@ -145,6 +153,41 @@ func main() {
                }
        }
 
+       if *mcdWait > 0 {
+               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)
+                                       }
+                               }
+                       }
+               }
+               addrs = nil
+               for i := int(*mcdWait); i > 0; i-- {
+                       nncp.MCDAddrsM.RLock()
+                       for _, mcdAddr := range nncp.MCDAddrs[*node.Id] {
+                               addrs = append(addrs, mcdAddr.Addr.String())
+                       }
+                       if len(addrs) > 0 {
+                               break
+                       }
+                       nncp.MCDAddrsM.RUnlock()
+                       time.Sleep(time.Second)
+               }
+               if len(addrs) == 0 {
+                       log.Fatalf("No MCD packets from the node during %d seconds", *mcdWait)
+               }
+       }
+
        var onlyPkts map[[32]byte]bool
        if len(*onlyPktsRaw) > 0 {
                splitted = strings.Split(*onlyPktsRaw, ",")
@@ -173,6 +216,7 @@ func main() {
                        *autoTossNoFreq,
                        *autoTossNoExec,
                        *autoTossNoTrns,
+                       *autoTossNoArea,
                )
        }
 
@@ -194,6 +238,7 @@ func main() {
                close(autoTossFinish)
                badCode = (<-autoTossBadCode) || badCode
        }
+       nncp.SPCheckerWg.Wait()
        if badCode {
                os.Exit(1)
        }