Index: tcp-transportmod.scm
==================================================================
--- tcp-transportmod.scm
+++ tcp-transportmod.scm
@@ -77,10 +77,11 @@
   port
   host-port
   dbfname
   server-id
   server-start
+  servinf-file
   pid
 )
 
 ;; Used for BOTH clients and servers
 (defstruct tt
@@ -139,15 +140,18 @@
 			       (tt-areapath ttdat)
 			       testsuite ;; (dbfile:testsuite-name)
 			       (common:find-local-megatest)
 			       run-id))))
     (if conn
-	conn ;; we are already connected to the server
+	(begin 
+          ; (debug:print-info 0 *default-log-port* "already connected to the server")
+           conn) ;; we are already connected to the server
 	(let* ((sdat (tt:get-current-server-info ttdat dbfname)))
 	  (match sdat
 	    ((host port start-time server-id pid dbfname2 servinffile)
 	     (assert (equal? dbfname dbfname2) "FATAL: read server info from wrong file.")
+             ;(debug:print-info 0 *default-log-port* "in match servinffile:" servinffile)
 	     (let* ((host-port (conc host":"port))
 		    (conn (make-tt-conn
 			   host: host
 			   port: port
 			   host-port: host-port
@@ -156,10 +160,11 @@
 			   server-id: server-id
 			   server-start: start-time
 			   pid: pid)))
 	       ;; verify we can talk to this server
 	       (let* ((ping-res (tt:ping host port server-id)))
+                ; (debug:print-info 0 *default-log-port* "ping-res:" ping-res)
 		 (case ping-res
 		   ((running)
 		    (hash-table-set! (tt-conns ttdat) dbfname conn) ;;; is this ok to save before validating that the connection is good?
 		    conn)
 		   ((starting)
@@ -216,10 +221,11 @@
   (let* ((conn (tt:client-connect-to-server ttdat dbfname run-id testsuite))) ;; (hash-table-ref/default (tt-conns ttdat) dbfname #f)))
     (if conn
 	;; have connection, call the server
 	(let* ((res (tt:send-receive ttdat conn cmd run-id params)))
 	  ;; res is (status errmsg result meta)
+          (debug:print 0 *default-log-port* "conn:" conn " res: " res)
 	  (match res
 	    ((status errmsg result meta)
 	     (if (list? meta)
 		 (let* ((delay-wait (alist-ref 'delay-wait meta)))
 		   (if (and (number? delay-wait)
@@ -242,11 +248,12 @@
 	     (if (not res) ;; tt:handler is telling us that communication failed
 		 (let* ((host    (tt-conn-host conn))
 			(port    (tt-conn-port conn))
 			;; (dbfname (tt-conn-port conn)) ;; 192.168.0.127:4242-726924:4.db
 			(pid     (tt-conn-pid  conn))
-			(servinf (tt-servinf-file ttdat))) ;; (conc areapath"/.servinfo/"host":"port"-"pid":"dbfname))) ;; TODO, use (server:get-servinfo-dir areapath)
+                        (servinf (tt-conn-servinf-file conn))) 
+			;;(servinf (tt-servinf-file ttdat))) ;; (conc areapath"/.servinfo/"host":"port"-"pid":"dbfname))) ;; TODO, use (server:get-servinfo-dir areapath)
 		   (hash-table-set! (tt-conns ttdat) dbfname #f)
 		   (if (and servinf (file-exists? servinf))
 		       (begin
 			 (if (< attemptnum 3)
 			     (begin