--- a/dreactor/protocol/RawTcp.d	Tue Jul 08 11:22:39 2008 -0400
+++ b/dreactor/protocol/RawTcp.d	Tue Jul 08 12:16:07 2008 -0400
@@ -8,7 +8,7 @@
 import tango.util.log.Config;
 
 import dreactor.transport.AsyncSocketConduit;
-import dreactor.core.SelectLoop;
+import dreactor.core.Vat;
 import dreactor.core.ConnectionHandler;
 
 /******************************************************************************
@@ -20,7 +20,7 @@
 {
 public
     Logger log; 
-    this(ConnectionHandler mgr, SelectLoop sel, IPv4Address addr)
+    this(ConnectionHandler mgr, Vat sel, IPv4Address addr)
     {
         manager = mgr;
         mgr.events(Event.Read);
@@ -30,7 +30,7 @@
         mgr.listen(addr);
         
         sel.addConnection(mgr);
-        select = sel;
+        vat = sel;
         log = Log.lookup("dreactor.protocol.RawTcpServer");
         log.info("log initialized");
         children = new CircularSeq!(ConnectionHandler);
@@ -42,7 +42,7 @@
         (cast(AsyncSocketConduit)cond).socket().accept(newcond.socket);
         ConnectionHandler h = ConnectionHandler.New(newcond, manager);
         h.events(Event.Read);
-        select.addConnection(h);
+        vat.addConnection(h);
         children.append(h);
         log.info("accepted new connection");
         return 0;
@@ -55,7 +55,7 @@
             if (h.appendOutBuffer(outbuf))
             {
                 h.addEvent(Event.Write);
-                select.addConnection(h);
+                vat.addConnection(h);
             }
         }
         return 0;
@@ -68,7 +68,7 @@
 
 private
     ConnectionHandler manager;
-    SelectLoop select;
+    Vat vat;
     CircularSeq!(ConnectionHandler) children;
 }
 
@@ -76,21 +76,21 @@
 {
 public
     Logger log;
-    this(ConnectionHandler mgr, SelectLoop sel, Event evts = Event.Read)
+    this(ConnectionHandler mgr, Vat sel, Event evts = Event.Read)
     {
         manager = mgr;
         manager.events(evts);
         connected = false;
         mgr.setOutgoingHandler(&Handlers.onSend);
         mgr.setIncomingHandler(&Handlers.onReceive);
-        select = sel;
+        vat = sel;
         log = Log.lookup("dreactor.protocol.RawTcpClient");
     }
 
     int connect(IPv4Address addr)
     {
         (cast(AsyncSocketConduit) manager.transport()).connect(addr);
-        select.addConnection(manager);
+        vat.addConnection(manager);
         connected = true;
         log.info("connected to {}", addr);
         return 0;
@@ -106,15 +106,14 @@
     **************************************************************************/
     int send(char[] outbuf, IPv4Address addr = null)
     {
-        log.info("sending buffer: {}", outbuf);
         if (!connected)
         {
-            log.info("not connected, connecting");
+            log.info("send: not connected, connecting");
             if (addr !is null)
             {
                 if (0 > connect(addr))
                 {
-                    log.error("unable to connect");
+                    log.error("send: unable to connect");
                     return -1;
                 }
             }
@@ -122,7 +121,7 @@
         if (manager.appendOutBuffer(outbuf))
         {
             manager.addEvent(Event.Write);
-            if (!select.addConnection(manager))
+            if (!vat.addConnection(manager))
             {
                 log.error("unable to register mgr");
             }
@@ -132,7 +131,7 @@
     
 private
     ConnectionHandler manager;
-    SelectLoop select;
+    Vat vat;
     bool connected;
 }
 
@@ -200,7 +199,7 @@
     char inbuf[8192];
     int amt;
     if((amt = h.transport.read(inbuf)) > 0)
-        log.info("Received Buffer: {}", inbuf[0 .. amt]);
+        log.info("Received {} byte Buffer: {}", amt, inbuf[0 .. amt]);
     else 
         log.error("Received no data, err = {}", amt);