X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcall.go;h=c4e04cbd9d2a1a47a1e5c5f27a62410b159d0a0c;hb=be389bd7f3d36d371007c86341059b042233d455;hp=1e20aa23f340a40549660de2878dfb1b97986c78;hpb=ab7c7eca0e53661f0ba904c2a6ba752990bea367;p=nncp.git

diff --git a/src/call.go b/src/call.go
index 1e20aa2..c4e04cb 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
@@ -18,12 +18,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package nncp
 
 import (
+	"errors"
 	"fmt"
 	"net"
+	"os"
+	"strings"
 	"time"
 
 	"github.com/dustin/go-humanize"
 	"github.com/gorhill/cronexpr"
+	nncpYggdrasil "go.cypherpunks.ru/nncp/v8/yggdrasil"
 )
 
 type Call struct {
@@ -68,11 +72,26 @@ 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 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
@@ -119,13 +138,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