X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-call%2Fmain.go;h=4d8fb0648a3eaf547b4d635bec8cf0a584e70a16;hb=2e59e1d8da61bc5dee797d351e50e8ed114aa4c7;hp=03a5a1a5c171a760be52a34631671bb7c635bd5d;hpb=712399b4547bd499528a20209d469b2eb1aaff28;p=nncp.git

diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go
index 03a5a1a..4d8fb06 100644
--- 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")
@@ -68,6 +71,7 @@ func main() {
 		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
@@ -150,6 +154,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, ",")
@@ -179,6 +218,7 @@ func main() {
 			*autoTossNoExec,
 			*autoTossNoTrns,
 			*autoTossNoArea,
+			*autoTossNoACK,
 		)
 	}