"sync"
"time"
- "go.cypherpunks.ru/nncp/v6"
+ "go.cypherpunks.ru/nncp/v7"
)
func usage() {
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 {
}
}
+ 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 {
)
}
+ 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,
}
}
wg.Wait()
+ nncp.SPCheckerWg.Wait()
}