X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcall.go;h=de1ce4f6796e12f1490cef36455c69dbc1f03426;hb=e068d88291cd45a4d6b748e258077dd6c0ffb9c2;hp=f916a8290646a61d340bbe78dedfb7a65e6d20ec;hpb=2758c63b64cf12e5f457daeb78e830959d26faae;p=nncp.git diff --git a/src/call.go b/src/call.go index f916a82..de1ce4f 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 +Copyright (C) 2016-2022 Sergey Matveev 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,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