X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-caller%2Fmain.go;h=e1e10f78729babb23f3b2023ea527b6947c299e9;hb=7c507e7ddba9fe5557df06c860fe9fa6197ba2e1;hp=b702b498038ca4eeb04a4e01b29e372ea70e83f4;hpb=ae2b0d687a4ed40fe0161b79b4a9ec42290ffb6b;p=nncp.git diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go index b702b49..e1e10f7 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 +Copyright (C) 2016-2023 Sergey Matveev 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,16 +23,17 @@ import ( "flag" "fmt" "log" + "net" "os" + "regexp" "sync" "time" - "go.cypherpunks.ru/nncp/v5" + "go.cypherpunks.ru/nncp/v8" ) func usage() { - fmt.Fprintf(os.Stderr, nncp.UsageHeader()) - fmt.Fprintf(os.Stderr, "nncp-caller -- croned NNCP TCP daemon caller\n\n") + fmt.Fprint(os.Stderr, "nncp-caller -- croned NNCP TCP daemon caller\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] [NODE ...]\n", os.Args[0]) fmt.Fprintln(os.Stderr, "Options:") flag.PrintDefaults() @@ -49,7 +50,17 @@ 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") + 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 { @@ -85,8 +96,17 @@ 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", nncp.LEs{{K: "Node", V: 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 +114,92 @@ func main() { } else { for _, node := range ctx.Neigh { if len(node.Calls) == 0 { - ctx.LogD("caller", nncp.LEs{{K: "Node", V: 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) } } + 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 { + return fmt.Sprintf("%s node, call %d", node.Name, i) + } for { n := time.Now() t := call.Cron.Next(n) - ctx.LogD("caller", les, t.String()) + ctx.LogD("caller-time", les, func(les nncp.LEs) string { + return logMsg(les) + ": " + t.String() + }) if t.IsZero() { - ctx.LogE("caller", les, 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", les, "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", les, "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", les, "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 +209,38 @@ 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, + &nncp.TossOpts{ + Nice: call.Nice, + DoSeen: call.AutoTossDoSeen || *autoTossDoSeen, + NoFile: call.AutoTossNoFile || *autoTossNoFile, + NoFreq: call.AutoTossNoFreq || *autoTossNoFreq, + NoExec: call.AutoTossNoExec || *autoTossNoExec, + NoTrns: call.AutoTossNoTrns || *autoTossNoTrns, + NoArea: call.AutoTossNoArea || *autoTossNoArea, + NoACK: 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, @@ -177,10 +248,11 @@ func main() { call.OnlineDeadline, call.MaxOnlineTime, false, + call.NoCK, nil, ) - if call.AutoToss { + if call.AutoToss || *autoToss { close(autoTossFinish) <-autoTossBadCode } @@ -194,4 +266,5 @@ func main() { } } wg.Wait() + nncp.SPCheckerWg.Wait() }