X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-caller%2Fmain.go;h=50d9bf4fc8b85aa8737cc48f2fd428b53bffa89d;hb=2e59e1d8da61bc5dee797d351e50e8ed114aa4c7;hp=d4fff0ca93e792c469332e8c1e5f5122cd1e8ed9;hpb=3ef61a935ab74f128ce3205cb55ec637df8effbc;p=nncp.git

diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go
index d4fff0c..50d9bf4 100644
--- 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-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,11 +23,13 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"net"
 	"os"
+	"regexp"
 	"sync"
 	"time"
 
-	"go.cypherpunks.ru/nncp/v6"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -51,12 +53,15 @@ 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
 	flag.Parse()
 	if *warranty {
@@ -92,6 +97,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",
@@ -120,19 +128,37 @@ func main() {
 		}
 	}
 
+	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)
+				}
+			}
+		}
+	}
+
 	var wg sync.WaitGroup
 	for _, node := range nodes {
 		for i, call := range node.Calls {
 			wg.Add(1)
 			go func(node *nncp.Node, i int, call *nncp.Call) {
 				defer wg.Done()
-				var addrs []string
+				var addrsFromCfg []string
 				if call.Addr == nil {
 					for _, addr := range node.Addrs {
-						addrs = append(addrs, addr)
+						addrsFromCfg = append(addrsFromCfg, addr)
 					}
 				} else {
-					addrs = append(addrs, *call.Addr)
+					addrsFromCfg = append(addrsFromCfg, *call.Addr)
 				}
 				les := nncp.LEs{{K: "Node", V: node.Id}, {K: "CallIndex", V: i}}
 				logMsg := func(les nncp.LEs) string {
@@ -193,12 +219,27 @@ func main() {
 								call.AutoTossNoFreq || *autoTossNoFreq,
 								call.AutoTossNoExec || *autoTossNoExec,
 								call.AutoTossNoTrns || *autoTossNoTrns,
+								call.AutoTossNoArea || *autoTossNoArea,
+								call.AutoTossNoACK || *autoTossNoACK,
 							)
 						}
 
+						var addrs []string
+						if !call.MCDIgnore {
+							nncp.MCDAddrsM.RLock()
+							for _, mcdAddr := range nncp.MCDAddrs[*node.Id] {
+								ctx.LogD("caller", les, func(les nncp.LEs) string {
+									return logMsg(les) + ": adding MCD address: " +
+										mcdAddr.Addr.String()
+								})
+								addrs = append(addrs, mcdAddr.Addr.String())
+							}
+							nncp.MCDAddrsM.RUnlock()
+						}
+
 						ctx.CallNode(
 							node,
-							addrs,
+							append(addrs, addrsFromCfg...),
 							call.Nice,
 							call.Xx,
 							call.RxRate,
@@ -224,4 +265,5 @@ func main() {
 		}
 	}
 	wg.Wait()
+	nncp.SPCheckerWg.Wait()
 }