Various Yggdrasil related refactoring and tcpip network stack

[nncp.git] / src / call.go

diff --git a/src/call.go b/src/call.go
index de1ce4f6796e12f1490cef36455c69dbc1f03426..c4e04cbd9d2a1a47a1e5c5f27a62410b159d0a0c 100644 (file)
--- 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
@@ -86,11 +85,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)
                }