-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 7d12066ae875df191a4ba742095657d3c2becddd..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/v7"
+       "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -47,6 +49,7 @@ func main() {
                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")
@@ -62,7 +65,7 @@ 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")
@@ -150,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, ",")