Multicast areas

[nncp.git] / src / cmd / nncp-call / main.go

diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go
index 9762d9216cd950f00390d1ea9a2ba1422eeb03a5..09c3e18414d56ee94647a2f306ee87d4692823f3 100644 (file)
--- a/src/cmd/nncp-call/main.go
+++ b/src/cmd/nncp-call/main.go
@@ -26,7 +26,7 @@ import (
        "strings"
        "time"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
@@ -44,6 +44,7 @@ func main() {
                rxOnly      = flag.Bool("rx", false, "Only receive packets")
                txOnly      = flag.Bool("tx", false, "Only transmit packets")
                listOnly    = flag.Bool("list", false, "Only list remote packets")
+               noCK        = flag.Bool("nock", false, "Do no checksum checking")
                onlyPktsRaw = flag.String("pkts", "", "Recieve only that packets, comma separated")
                rxRate      = flag.Int("rxrate", 0, "Maximal receive rate, pkts/sec")
                txRate      = flag.Int("txrate", 0, "Maximal transmit rate, pkts/sec")
@@ -65,7 +66,9 @@ func main() {
                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
        flag.Parse()
        if *warranty {
@@ -172,6 +175,7 @@ func main() {
                        *autoTossNoFreq,
                        *autoTossNoExec,
                        *autoTossNoTrns,
+                       *autoTossNoArea,
                )
        }
 
@@ -185,6 +189,7 @@ func main() {
                onlineDeadline,
                maxOnlineTime,
                *listOnly,
+               *noCK,
                onlyPkts,
        )
 
@@ -192,6 +197,7 @@ func main() {
                close(autoTossFinish)
                badCode = (<-autoTossBadCode) || badCode
        }
+       nncp.SPCheckerWg.Wait()
        if badCode {
                os.Exit(1)
        }