Yggdrasil overlay transport

[nncp.git] / src / call.go

diff --git a/src/call.go b/src/call.go
index c52fc419ecafe6a75e45afaf9a14e99bd8c5a6ee..de1ce4f6796e12f1490cef36455c69dbc1f03426 100644 (file)
--- a/src/call.go
+++ b/src/call.go
@@ -22,12 +22,15 @@ import (
        "fmt"
        "net"
        "os"
+       "strings"
        "time"
 
        "github.com/dustin/go-humanize"
        "github.com/gorhill/cronexpr"
 )
 
+const YggdrasilPrefix = "yggdrasil:"
+
 type Call struct {
        Cron           *cronexpr.Expression
        Nice           uint8
@@ -83,11 +86,16 @@ func (ctx *Ctx) CallNode(
                        if addr == "" {
                                addr = UCSPITCPClient
                        }
+               } else if strings.HasPrefix(addr, YggdrasilPrefix) {
+                       conn, err = NewYggdrasilConn(
+                               ctx.YggdrasilAliases,
+                               strings.TrimPrefix(addr, YggdrasilPrefix),
+                       )
                } 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