X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-caller%2Fmain.go;h=4608484570a9061c0df4ede8db1ceb25728aeec0;hb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;hp=f7ab13c23299cc301608920776df84f417266042;hpb=561313b1994a8fadac5152bbdc7a980881fd93e0;p=nncp.git

diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go
index f7ab13c..4608484 100644
--- a/src/cmd/nncp-caller/main.go
+++ b/src/cmd/nncp-caller/main.go
@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	"go.cypherpunks.ru/nncp/v5"
+	"go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
@@ -49,7 +49,15 @@ func main() {
 		debug     = flag.Bool("debug", false, "Print debug messages")
 		version   = flag.Bool("version", false, "Print version information")
 		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")
+		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")
 	)
+	log.SetFlags(log.Lshortfile)
 	flag.Usage = usage
 	flag.Parse()
 	if *warranty {
@@ -86,7 +94,13 @@ func main() {
 				log.Fatalln("Invalid NODE specified:", err)
 			}
 			if len(node.Calls) == 0 {
-				ctx.LogD("caller", nncp.SDS{"node": node.Id}, "has no calls, skipping")
+				ctx.LogD(
+					"caller-no-calls",
+					nncp.LEs{{K: "Node", V: node.Id}},
+					func(les nncp.LEs) string {
+						return fmt.Sprintf("%s node has no calls, skipping", node.Name)
+					},
+				)
 				continue
 			}
 			nodes = append(nodes, node)
@@ -94,58 +108,80 @@ func main() {
 	} else {
 		for _, node := range ctx.Neigh {
 			if len(node.Calls) == 0 {
-				ctx.LogD("caller", nncp.SDS{"node": node.Id}, "has no calls, skipping")
+				ctx.LogD(
+					"caller-no-calls",
+					nncp.LEs{{K: "Node", V: node.Id}},
+					func(les nncp.LEs) string {
+						return fmt.Sprintf("%s node has no calls, skipping", node.Name)
+					},
+				)
 				continue
 			}
 			nodes = append(nodes, node)
 		}
 	}
 
+	for _, ifiName := range ctx.MCDRxIfis {
+		if err = ctx.MCDRx(ifiName); err != nil {
+			log.Fatalln("Can not run MCD reception:", 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 {
+					return fmt.Sprintf("%s node, call %d", node.Name, i)
 				}
-				sds := nncp.SDS{"node": node.Id, "callindex": i}
 				for {
 					n := time.Now()
 					t := call.Cron.Next(n)
-					ctx.LogD("caller", sds, t.String())
+					ctx.LogD("caller-time", les, func(les nncp.LEs) string {
+						return logMsg(les) + ": " + t.String()
+					})
 					if t.IsZero() {
-						ctx.LogE("caller", sds, errors.New("got zero time"), "")
+						ctx.LogE("caller", les, errors.New("got zero time"), logMsg)
 						return
 					}
 					time.Sleep(t.Sub(n))
 					node.Lock()
 					if node.Busy {
 						node.Unlock()
-						ctx.LogD("caller", sds, "busy")
+						ctx.LogD("caller-busy", les, func(les nncp.LEs) string {
+							return logMsg(les) + ": busy"
+						})
 						continue
 					} else {
 						node.Busy = true
 						node.Unlock()
 
 						if call.WhenTxExists && call.Xx != "TRx" {
-							ctx.LogD("caller", sds, "checking tx existence")
+							ctx.LogD("caller", les, func(les nncp.LEs) string {
+								return logMsg(les) + ": checking tx existence"
+							})
 							txExists := false
 							for job := range ctx.Jobs(node.Id, nncp.TTx) {
-								job.Fd.Close()
 								if job.PktEnc.Nice > call.Nice {
 									continue
 								}
 								txExists = true
 							}
 							if !txExists {
-								ctx.LogD("caller", sds, "no tx")
+								ctx.LogD("caller-no-tx", les, func(les nncp.LEs) string {
+									return logMsg(les) + ": no tx"
+								})
 								node.Lock()
 								node.Busy = false
 								node.Unlock()
@@ -155,21 +191,34 @@ func main() {
 
 						var autoTossFinish chan struct{}
 						var autoTossBadCode chan bool
-						if call.AutoToss {
+						if call.AutoToss || *autoToss {
 							autoTossFinish, autoTossBadCode = ctx.AutoToss(
 								node.Id,
 								call.Nice,
-								call.AutoTossDoSeen,
-								call.AutoTossNoFile,
-								call.AutoTossNoFreq,
-								call.AutoTossNoExec,
-								call.AutoTossNoTrns,
+								call.AutoTossDoSeen || *autoTossDoSeen,
+								call.AutoTossNoFile || *autoTossNoFile,
+								call.AutoTossNoFreq || *autoTossNoFreq,
+								call.AutoTossNoExec || *autoTossNoExec,
+								call.AutoTossNoTrns || *autoTossNoTrns,
 							)
 						}
 
+						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,
@@ -177,10 +226,11 @@ func main() {
 							call.OnlineDeadline,
 							call.MaxOnlineTime,
 							false,
+							call.NoCK,
 							nil,
 						)
 
-						if call.AutoToss {
+						if call.AutoToss || *autoToss {
 							close(autoTossFinish)
 							<-autoTossBadCode
 						}
@@ -194,4 +244,5 @@ func main() {
 		}
 	}
 	wg.Wait()
+	nncp.SPCheckerWg.Wait()
 }