connection is now reference not value

4 files changed, 5 insertions, 12 deletions

diff --git a/appl/charon/chutils.b b/appl/charon/chutils.b
index 3f507108..8dd823f2 100644
--- a/appl/charon/chutils.b
+++ b/appl/charon/chutils.b
@@ -826,9 +826,7 @@ Netconn.makefree(nc: self ref Netconn)
 		sys->print("NC %d: free\n", nc.id);
 	nc.state = NCfree;
 	nc.host = "";
-	nc.conn.dfd = nil;
-	nc.conn.cfd = nil;
-	nc.conn.dir = "";
+	nc.conn = nil;
 	nc.qlen = 0;
 	nc.gocur = 0;
 	nc.ngcur = 0;
diff --git a/appl/charon/file.b b/appl/charon/file.b
index 1a5947c1..6662b151 100644
--- a/appl/charon/file.b
+++ b/appl/charon/file.b
@@ -39,6 +39,7 @@ gethdr(nc: ref Netconn, bs: ref ByteSource)
 	u := bs.req.url;
 	f := u.path;
 	hdr := Header.new();
+	nc.conn = ref Dial->Connection;
 	nc.conn.dfd = sys->open(f, sys->OREAD);
 	if(nc.conn.dfd == nil) {
 		if(dbg)
@@ -127,8 +128,6 @@ defaultport(nil: string) : int
 
 closeconn(nc: ref Netconn)
 {
-	nc.conn.dfd = nil;
-	nc.conn.cfd = nil;
-	nc.conn.dir = "";
+	nc.conn = nil;
 	nc.connected = 0;
 }
diff --git a/appl/charon/ftp.b b/appl/charon/ftp.b
index 20834235..cb9578e5 100644
--- a/appl/charon/ftp.b
+++ b/appl/charon/ftp.b
@@ -308,8 +308,6 @@ defaultport(nil: string) : int
 
 closeconn(nc: ref Netconn)
 {
-	nc.conn.dfd = nil;
-	nc.conn.cfd = nil;
-	nc.conn.dir = "";
+	nc.conn = nil;
 	nc.connected = 0;
 }
diff --git a/appl/charon/http.b b/appl/charon/http.b
index 05d2396c..d97b6b23 100644
--- a/appl/charon/http.b
+++ b/appl/charon/http.b
@@ -977,9 +977,7 @@ defaultport(scheme: string) : int
 
 closeconn(nc: ref Netconn)
 {
-	nc.conn.dfd = nil;
-	nc.conn.cfd = nil;
-	nc.conn.dir = "";
+	nc.conn = nil;
 	nc.connected = 0;
 	nc.sslx = nil;
 }