X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcall.go;h=295e7c8805c62eaee4cf0d3fd5051e4e86fb2251;hb=2e59e1d8da61bc5dee797d351e50e8ed114aa4c7;hp=e8b3f765233175b1f87339da8c1bf8b92371b4f9;hpb=bd98bc071da6b50d20ddf1df02af69111df4831c;p=nncp.git

diff --git a/src/call.go b/src/call.go
index e8b3f76..295e7c8 100644
--- 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
@@ -22,10 +22,12 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/dustin/go-humanize"
 	"github.com/gorhill/cronexpr"
+	nncpYggdrasil "go.cypherpunks.ru/nncp/v8/yggdrasil"
 )
 
 type Call struct {
@@ -48,6 +50,7 @@ type Call struct {
 	AutoTossNoExec bool
 	AutoTossNoTrns bool
 	AutoTossNoArea bool
+	AutoTossNoACK  bool
 }
 
 func (ctx *Ctx) CallNode(
@@ -83,11 +86,13 @@ func (ctx *Ctx) CallNode(
 			if addr == "" {
 				addr = UCSPITCPClient
 			}
+		} else if strings.HasPrefix(addr, "yggdrasilc://") {
+			conn, err = nncpYggdrasil.NewConn(ctx.YggdrasilAliases, addr)
 		} else {
 			conn, err = net.Dial("tcp", addr)
 		}
 		if err != nil {
-			ctx.LogD("calling", append(les, LE{"Err", err}), func(les LEs) string {
+			ctx.LogE("calling", les, err, func(les LEs) string {
 				return fmt.Sprintf("Calling %s (%s)", node.Name, addr)
 			})
 			continue
@@ -134,13 +139,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