From fbc1184c08d18d5ac0f8763a058e015e95353341 Mon Sep 17 00:00:00 2001 From: Charles Forsyth Date: Wed, 29 Apr 2015 17:44:33 +0100 Subject: switch to Dial module --- appl/svc/webget/ftp.b | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'appl/svc/webget/ftp.b') diff --git a/appl/svc/webget/ftp.b b/appl/svc/webget/ftp.b index 9162fcb7..d5030bc9 100644 --- a/appl/svc/webget/ftp.b +++ b/appl/svc/webget/ftp.b @@ -22,6 +22,9 @@ include "url.m"; include "webget.m"; +include "dial.m"; + DI: Dial; + include "wgutils.m"; W: WebgetUtils; Fid, Req: import WebgetUtils; @@ -42,6 +45,7 @@ init(w: WebgetUtils) S = W->S; B = W->B; U = W->U; + DI = W->DI; } connect(c: ref Fid, r: ref Req, donec: chan of ref Fid) @@ -53,13 +57,13 @@ connect(c: ref Fid, r: ref Req, donec: chan of ref Fid) port := u.port; if(port == "") port = FTPPORT; - addr := "tcp!" + u.host + "!" + port; + addr := DI->netmkaddr(u.host, "tcp", port); dummyloop: # just for breaking out of on error for(;;) { W->log(c, sys->sprint("ftp: dialing %s", addr)); - (ok, net) := sys->dial(addr, nil); - if(ok < 0) { + net := DI->dial(addr, nil); + if(net == nil) { err = sys->sprint("dial error: %r"); break dummyloop; } -- cgit v1.2.3