Raise copyright years

[nncp.git] / src / call.go

diff --git a/src/call.go b/src/call.go
index a201825f82358777700b3af793a9f4905526debd..c52fc419ecafe6a75e45afaf9a14e99bd8c5a6ee 100644 (file)
--- a/src/call.go
+++ b/src/call.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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
@@ -18,8 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package nncp
 
 import (
+       "errors"
        "fmt"
        "net"
+       "os"
        "time"
 
        "github.com/dustin/go-humanize"
@@ -45,6 +47,7 @@ type Call struct {
        AutoTossNoFreq bool
        AutoTossNoExec bool
        AutoTossNoTrns bool
+       AutoTossNoArea bool
 }
 
 func (ctx *Ctx) CallNode(
@@ -56,7 +59,7 @@ func (ctx *Ctx) CallNode(
        onlineDeadline, maxOnlineTime time.Duration,
        listOnly bool,
        noCK bool,
-       onlyPkts map[[32]byte]bool,
+       onlyPkts map[[MTHSize]byte]bool,
 ) (isGood bool) {
        for _, addr := range addrs {
                les := LEs{{"Node", node.Id}, {"Addr", addr}}
@@ -67,6 +70,19 @@ func (ctx *Ctx) CallNode(
                var err error
                if addr[0] == '|' {
                        conn, err = NewPipeConn(addr[1:])
+               } else if addr == UCSPITCPClient {
+                       ucspiConn := UCSPIConn{R: os.NewFile(6, "R"), W: os.NewFile(7, "W")}
+                       if ucspiConn.R == nil {
+                               err = errors.New("no 6 file descriptor")
+                       }
+                       if ucspiConn.W == nil {
+                               err = errors.New("no 7 file descriptor")
+                       }
+                       conn = ucspiConn
+                       addr = UCSPITCPRemoteAddr()
+                       if addr == "" {
+                               addr = UCSPITCPClient
+                       }
                } else {
                        conn, err = net.Dial("tcp", addr)
                }
@@ -110,7 +126,7 @@ func (ctx *Ctx) CallNode(
                                        node.Name,
                                        int(state.Duration.Hours()),
                                        int(state.Duration.Minutes()),
-                                       int(state.Duration.Seconds()/60),
+                                       int(state.Duration.Seconds())%60,
                                        humanize.IBytes(uint64(state.RxBytes)),
                                        humanize.IBytes(uint64(state.RxSpeed)),
                                        humanize.IBytes(uint64(state.TxBytes)),
@@ -118,13 +134,13 @@ func (ctx *Ctx) CallNode(
                                )
                        })
                        isGood = true
-                       conn.Close() // #nosec G104
+                       conn.Close()
                        break
                } else {
                        ctx.LogE("call-started", les, err, func(les LEs) string {
                                return fmt.Sprintf("Connection to %s (%s)", node.Name, addr)
                        })
-                       conn.Close() // #nosec G104
+                       conn.Close()
                }
        }
        return