X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-caller%2Fmain.go;h=0e5de53b3c4953eeee2b08151cc7ef4ebca948f8;hb=b47dbfe6687569650fa544a4ecf3e4ea388390cb;hp=e338ac95b5febdc887ef40c00dbcffb8cee09199;hpb=ab288c7da7b7d9896a422bfe9a9fb91e00316c54;p=nncp.git diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go index e338ac9..0e5de53 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/v6" + "go.cypherpunks.ru/nncp/v8" ) func usage() { @@ -51,11 +51,12 @@ 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") ) log.SetFlags(log.Lshortfile) flag.Usage = usage @@ -93,6 +94,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", @@ -123,7 +127,7 @@ func main() { for _, ifiName := range ctx.MCDRxIfis { if err = ctx.MCDRx(ifiName); err != nil { - log.Fatalln("Can not run MCD reception:", err) + log.Printf("Can not run MCD reception on %s: %s", ifiName, err) } } @@ -200,6 +204,7 @@ func main() { call.AutoTossNoFreq || *autoTossNoFreq, call.AutoTossNoExec || *autoTossNoExec, call.AutoTossNoTrns || *autoTossNoTrns, + call.AutoTossNoArea || *autoTossNoArea, ) } @@ -244,4 +249,5 @@ func main() { } } wg.Wait() + nncp.SPCheckerWg.Wait() }