X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcall.go;h=295e7c8805c62eaee4cf0d3fd5051e4e86fb2251;hb=2e59e1d8da61bc5dee797d351e50e8ed114aa4c7;hp=de1ce4f6796e12f1490cef36455c69dbc1f03426;hpb=128618d02d84d08164060f14e7fdd3b87e491fcb;p=nncp.git diff --git a/src/call.go b/src/call.go index de1ce4f..295e7c8 100644 --- a/src/call.go +++ b/src/call.go @@ -27,10 +27,9 @@ import ( "github.com/dustin/go-humanize" "github.com/gorhill/cronexpr" + nncpYggdrasil "go.cypherpunks.ru/nncp/v8/yggdrasil" ) -const YggdrasilPrefix = "yggdrasil:" - type Call struct { Cron *cronexpr.Expression Nice uint8 @@ -51,6 +50,7 @@ type Call struct { AutoTossNoExec bool AutoTossNoTrns bool AutoTossNoArea bool + AutoTossNoACK bool } func (ctx *Ctx) CallNode( @@ -86,11 +86,8 @@ func (ctx *Ctx) CallNode( if addr == "" { addr = UCSPITCPClient } - } else if strings.HasPrefix(addr, YggdrasilPrefix) { - conn, err = NewYggdrasilConn( - ctx.YggdrasilAliases, - strings.TrimPrefix(addr, YggdrasilPrefix), - ) + } else if strings.HasPrefix(addr, "yggdrasilc://") { + conn, err = nncpYggdrasil.NewConn(ctx.YggdrasilAliases, addr) } else { conn, err = net.Dial("tcp", addr) }