X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-call%2Fmain.go;h=4d8fb0648a3eaf547b4d635bec8cf0a584e70a16;hb=2e59e1d8da61bc5dee797d351e50e8ed114aa4c7;hp=dde658ff3a7b938b9037e2d6403b9c2814a6cbab;hpb=46a831419b4b0ba458283ba705abfcc100f41242;p=nncp.git diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go index dde658f..4d8fb06 100644 --- a/src/cmd/nncp-call/main.go +++ b/src/cmd/nncp-call/main.go @@ -1,6 +1,6 @@ /* NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2019 Sergey Matveev +Copyright (C) 2016-2022 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 @@ -22,10 +22,13 @@ import ( "flag" "fmt" "log" + "net" "os" + "regexp" "strings" + "time" - "go.cypherpunks.ru/nncp/v5" + "go.cypherpunks.ru/nncp/v8" ) func usage() { @@ -39,23 +42,38 @@ func usage() { func main() { var ( cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") + ucspi = flag.Bool("ucspi", false, "Is it started as UCSPI-TCP client") niceRaw = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness") 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") + mcdWait = flag.Uint("mcd-wait", 0, "Wait for MCD for specified number of seconds") rxRate = flag.Int("rxrate", 0, "Maximal receive rate, pkts/sec") txRate = flag.Int("txrate", 0, "Maximal transmit rate, pkts/sec") spoolPath = flag.String("spool", "", "Override path to spool") logPath = flag.String("log", "", "Override path to logfile") quiet = flag.Bool("quiet", false, "Print only errors") + showPrgrs = flag.Bool("progress", false, "Force progress showing") + omitPrgrs = flag.Bool("noprogress", false, "Omit progress showing") debug = flag.Bool("debug", false, "Print debug messages") version = flag.Bool("version", false, "Print version information") warranty = flag.Bool("warranty", false, "Print warranty information") - onlineDeadline = flag.Uint("onlinedeadline", 0, "Override onlinedeadline option") - maxOnlineTime = flag.Uint("maxonlinetime", 0, "Override maxonlinetime option") + onlineDeadlineSec = flag.Uint("onlinedeadline", 0, "Override onlinedeadline option") + maxOnlineTimeSec = flag.Uint("maxonlinetime", 0, "Override maxonlinetime option") + + 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 { @@ -78,7 +96,15 @@ func main() { log.Fatalln("-rx and -tx can not be set simultaneously") } - ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug) + ctx, err := nncp.CtxFromCmdline( + *cfgPath, + *spoolPath, + *logPath, + *quiet, + *showPrgrs, + *omitPrgrs, + *debug, + ) if err != nil { log.Fatalln("Error during initialization:", err) } @@ -95,11 +121,13 @@ func main() { log.Fatalln("Node does not have online communication capability") } - if *onlineDeadline == 0 { - onlineDeadline = &node.OnlineDeadline + onlineDeadline := node.OnlineDeadline + if *onlineDeadlineSec != 0 { + onlineDeadline = time.Duration(*onlineDeadlineSec) * time.Second } - if *maxOnlineTime == 0 { - maxOnlineTime = &node.MaxOnlineTime + maxOnlineTime := node.MaxOnlineTime + if *maxOnlineTimeSec != 0 { + maxOnlineTime = time.Duration(*maxOnlineTimeSec) * time.Second } var xxOnly nncp.TRxTx @@ -110,7 +138,9 @@ func main() { } var addrs []string - if flag.NArg() == 2 { + if *ucspi { + addrs = append(addrs, nncp.UCSPITCPClient) + } else if flag.NArg() == 2 { addrs = append(addrs, flag.Arg(1)) } else if len(splitted) == 2 { addr, known := ctx.Neigh[*node.Id].Addrs[splitted[1]] @@ -124,12 +154,47 @@ func main() { } } + if *mcdWait > 0 { + 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) + } + } + } + } + addrs = nil + for i := int(*mcdWait); i > 0; i-- { + nncp.MCDAddrsM.RLock() + for _, mcdAddr := range nncp.MCDAddrs[*node.Id] { + addrs = append(addrs, mcdAddr.Addr.String()) + } + if len(addrs) > 0 { + break + } + nncp.MCDAddrsM.RUnlock() + time.Sleep(time.Second) + } + if len(addrs) == 0 { + log.Fatalf("No MCD packets from the node during %d seconds", *mcdWait) + } + } + var onlyPkts map[[32]byte]bool if len(*onlyPktsRaw) > 0 { splitted = strings.Split(*onlyPktsRaw, ",") onlyPkts = make(map[[32]byte]bool, len(splitted)) for _, pktIdRaw := range splitted { - pktId, err := nncp.FromBase32(pktIdRaw) + pktId, err := nncp.Base32Codec.DecodeString(pktIdRaw) if err != nil { log.Fatalln("Invalid packet specified: ", err) } @@ -140,18 +205,43 @@ func main() { } ctx.Umask() - if !ctx.CallNode( + + var autoTossFinish chan struct{} + var autoTossBadCode chan bool + if *autoToss { + autoTossFinish, autoTossBadCode = ctx.AutoToss( + node.Id, + nice, + *autoTossDoSeen, + *autoTossNoFile, + *autoTossNoFreq, + *autoTossNoExec, + *autoTossNoTrns, + *autoTossNoArea, + *autoTossNoACK, + ) + } + + badCode := !ctx.CallNode( node, addrs, nice, xxOnly, *rxRate, *txRate, - *onlineDeadline, - *maxOnlineTime, + onlineDeadline, + maxOnlineTime, *listOnly, + *noCK, onlyPkts, - ) { + ) + + if *autoToss { + close(autoTossFinish) + badCode = (<-autoTossBadCode) || badCode + } + nncp.SPCheckerWg.Wait() + if badCode { os.Exit(1) } }