From 62d7827bc358c000db9ff48fe61bd28ac352a884 Mon Sep 17 00:00:00 2001
From: charles forsyth <charles.forsyth@gmail.com>
Date: Sat, 13 Jun 2015 16:34:09 +0100
Subject: mkfiles/mkfile-Linux-386

---
 appl/charon/http.b | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'appl/charon/http.b')

diff --git a/appl/charon/http.b b/appl/charon/http.b
index d1208091..05d2396c 100644
--- a/appl/charon/http.b
+++ b/appl/charon/http.b
@@ -52,6 +52,7 @@ U: Url;
 S: String;
 C: Ctype;
 T: StringIntTab;
+DI: Dial;
 CU: CharonUtils;
 	Netconn, ByteSource, Header, config, Nameval : import CU;
 
@@ -251,6 +252,7 @@ init(cu: CharonUtils)
 	U = load Url Url->PATH; 
 	if (U != nil)
 		U->init();
+	DI = cu->DI;
 	C = cu->C;
 	T = load StringIntTab StringIntTab->PATH;
 #	D = load Date CU->loadpath(Date->PATH);
@@ -280,13 +282,12 @@ connect(nc: ref Netconn, bs: ref ByteSource)
 		if(config.httpproxy.port != "")
 			dialport = config.httpproxy.port;
 	}
-	addr := "tcp!" + dialhost + "!" + dialport;
+	addr := DI->netmkaddr(dialhost, "net", dialport);
 	err := "";
 	if(dbg)
 		sys->print("http %d: dialing %s\n", nc.id, addr);
-	rv: int;
-	(rv, nc.conn) = sys->dial(addr, nil);
-	if(rv < 0) {
+	nc.conn = DI->dial(addr, nil);
+	if(nc.conn == nil) {
 		syserr := sys->sprint("%r");
 		if(S->prefix("cs: dialup", syserr))
 			err = syserr[4:];
@@ -352,7 +353,7 @@ vers = 3;
 	}
 }
 
-constate(msg: string, conn: Sys->Connection)
+constate(msg: string, conn: ref Dial->Connection)
 {
 	fd := conn.dfd;
 	fdfd := -1;
-- 
cgit v1.2.3