Raise copyright years

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

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-call/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-call/main.go
index a3861dc68d9ea7a99c953cc36843831125943dd9..f8d3064c982d4953f682ceca7f934c0595c950c7 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-call/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-call/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2018 Sergey Matveev <stargrave@stargrave.org>
 
 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,11 +22,8 @@ package main
 import (
        "flag"
        "fmt"
-       "io/ioutil"
        "log"
-       "net"
        "os"
-       "strconv"
        "strings"
 
        "cypherpunks.ru/nncp"
@@ -42,14 +39,19 @@ func usage() {
 
 func main() {
        var (
-               cfgPath  = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-               niceRaw  = flag.Int("nice", 255, "Minimal required niceness")
-               rxOnly   = flag.Bool("rx", false, "Only receive packets")
-               txOnly   = flag.Bool("tx", false, "Only transfer packets")
-               quiet    = flag.Bool("quiet", false, "Print only errors")
-               debug    = flag.Bool("debug", false, "Print debug messages")
-               version  = flag.Bool("version", false, "Print version information")
-               warranty = flag.Bool("warranty", false, "Print warranty information")
+               cfgPath   = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+               niceRaw   = flag.Int("nice", 255, "Minimal required niceness")
+               rxOnly    = flag.Bool("rx", false, "Only receive packets")
+               txOnly    = flag.Bool("tx", false, "Only transfer packets")
+               spoolPath = flag.String("spool", "", "Override path to spool")
+               logPath   = flag.String("log", "", "Override path to logfile")
+               quiet     = flag.Bool("quiet", false, "Print only errors")
+               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")
        )
        flag.Usage = usage
        flag.Parse()
@@ -73,16 +75,13 @@ func main() {
                log.Fatalln("-rx and -tx can not be set simultaneously")
        }
 
-       cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
+       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
        if err != nil {
-               log.Fatalln("Can not read config:", err)
+               log.Fatalln("Error during initialization:", err)
        }
-       ctx, err := nncp.CfgParse(cfgRaw)
-       if err != nil {
-               log.Fatalln("Can not parse config:", err)
+       if ctx.Self == nil {
+               log.Fatalln("Config lacks private keys")
        }
-       ctx.Quiet = *quiet
-       ctx.Debug = *debug
 
        splitted := strings.SplitN(flag.Arg(0), ":", 2)
        node, err := ctx.FindNode(splitted[0])
@@ -93,6 +92,13 @@ func main() {
                log.Fatalln("Node does not have online communication capability")
        }
 
+       if *onlineDeadline == 0 {
+               onlineDeadline = &node.OnlineDeadline
+       }
+       if *maxOnlineTime == 0 {
+               maxOnlineTime = &node.MaxOnlineTime
+       }
+
        var xxOnly nncp.TRxTx
        if *rxOnly {
                xxOnly = nncp.TRx
@@ -115,36 +121,7 @@ func main() {
                }
        }
 
-       isGood := false
-       for _, addr := range addrs {
-               ctx.LogD("call", nncp.SDS{"addr": addr}, "dialing")
-               conn, err := net.Dial("tcp", addr)
-               if err != nil {
-                       log.Println("Can not connect:", err)
-                       continue
-               }
-               ctx.LogD("call", nncp.SDS{"addr": addr}, "connected")
-               state, err := ctx.StartI(conn, node.Id, nice, &xxOnly)
-               if err == nil {
-                       ctx.LogI("call-start", nncp.SDS{"node": state.NodeId}, "connected")
-                       state.Wait()
-                       ctx.LogI("call-finish", nncp.SDS{
-                               "node":     state.NodeId,
-                               "duration": strconv.FormatInt(int64(state.Duration.Seconds()), 10),
-                               "rxbytes":  strconv.FormatInt(state.RxBytes, 10),
-                               "txbytes":  strconv.FormatInt(state.TxBytes, 10),
-                               "rxspeed":  strconv.FormatInt(state.RxSpeed, 10),
-                               "txspeed":  strconv.FormatInt(state.TxSpeed, 10),
-                       }, "")
-                       isGood = true
-                       conn.Close()
-                       break
-               } else {
-                       ctx.LogE("call-start", nncp.SDS{"node": state.NodeId, "err": err}, "")
-                       conn.Close()
-               }
-       }
-       if !isGood {
+       if !ctx.CallNode(node, addrs, nice, xxOnly, *onlineDeadline, *maxOnlineTime) {
                os.Exit(1)
        }
 }