a few changes towards the tunnel manager

1 files changed, 13 insertions, 8 deletions

diff --git a/src/Ghost.java b/src/Ghost.java
index fd7465d..f8f76cf 100644
--- a/src/Ghost.java
+++ b/src/Ghost.java
@@ -18,25 +18,30 @@ class Ghost extends IvyClient {
   private String id; // given to the Proxy by the Master
   private ProxyClient pc;
 
-  Ghost(Ivy bus, Socket socket,int remotePort,boolean incoming,String id,ProxyClient pc) throws IOException {
+  Ghost(Ivy bus, Socket socket,int remotePort,boolean incoming,String id,ProxyClient pc)
+  throws IOException {
     super(bus,socket,remotePort,incoming);
     this.id=id;
     this.pc=pc;
-    System.out.println("new Ghost: "+id+" pc:"+pc);
+    System.out.println("Ghost["+id+"] created");
   }
 
   // ProxyClient -> Ghost -> Ivy Bus
-  protected synchronized void sendBuffer( String buffer ) throws IvyException {
-    // System.out.println("out buffer: "+buffer+" for:"+pc+" id:"+id);
-    super.sendBuffer(buffer); // and to all the agents on the Ghost bus ? I'm not sure
+  protected synchronized void sendBuffer( String s ) throws IvyException {
+    System.out.println("Ghost["+id+"] sending ["+s+"]");
+    super.sendBuffer(s); // and to all the agents on the Ghost bus ? I'm not sure
   }
 
   // Bus -> Ghost -> ProxyClient -> ProxyMaster -> other buses
   protected boolean newParseMsg(String s) throws IvyException {
     // I received a message from an agent on the bus
-    System.out.println("in buffer to forward from "+id+": "+s);
-    if (pc!=null) pc.forward(id,s); // forward to all the puppets
-    return super.newParseMsg(s); // I'll take no action
+    if (pc!=null) {
+      System.out.println("Ghost["+id+"] forwarding ["+s+"]");
+      pc.forwardPuppet(id,s); // forward to all the puppets
+    } else {
+      System.out.println("Warning, Ghost ["+id+"] could not forward ["+s+"] to null pc");
+    }
+    return super.newParseMsg(s); // I'm a normal Ivy citizen
   }
 
 }