@@ -68,69 +68,39 @@
 
 ;;======================================================================
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
 
-;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
-;;
-(define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
+;; how to make area-dat
+(define (rmt:set-ttdat areapath ttdat)
+  (if (not ttdat)
+      (let* ((newremote  (make-and-init-remote areapath)))
+	(set! *ttdat* newremote)
+	ttdat)))
+
+;; NB// area-dat replaced by ttdat
+;; 
+(define (rmt:send-receive cmd run-id params #!key (attemptnum 1)(ttdat #f))
   (assert *toppath* "FATAL: rmt:send-receive called with *toppath* not set.")
-
-  (if (not (eq? (rmt:transport-mode) 'nfs))
-      (begin
-	(if (> attemptnum 2)
-	    (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
-	
-	(cond
-	 ((> attemptnum 2) (thread-sleep! 0.05))
-	 ((> attemptnum 10) (thread-sleep! 0.5))
-	 ((> attemptnum 20) (thread-sleep! 1)))
-	
-	;; I'm turning this off, it may make sense to move it
-	;; into http-transport-handler
-	(if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))  
-	    (begin
-	      (debug:print 0 *default-log-port* "ERROR: can't connect to server, trying to start a server.")
-	      (case (rmt:transport-mode)
-		((http)
-		 (server:run *toppath*)
-		 (thread-sleep! 3))
-		(else
-		 (thread-sleep! 1) ;; for tcp the server is started by routines in tcp-transportmod. For nfs there is no server
-		 ))))))
-  
-  ;; 1. check if server is started IFF cmd is a write OR if we are not on the homehost, store in runremote
-  ;; 2. check the age of the connections. refresh the connection if it is older than timeout-20 seconds.
-  ;; 3. do the query, if on homehost use local access
-  ;;
+  (assert ttdat     "FATAL: rmt:send-receive must receive initialized area-dat")
   (let* ((start-time    (current-seconds)) ;; snapshot time so all use cases get same value
          (areapath      *toppath*);; TODO - resolve from dbstruct to be compatible with multiple areas
-	 (runremote     (or area-dat
-			    *runremote*))
          (attemptnum    (+ 1 attemptnum))
-	 (readonly-mode (rmtmod:calc-ro-mode runremote *toppath*))
+	 (readonly-mode (rmtmod:calc-ro-mode ttdat *toppath*))
 	 (testsuite     (common:get-testsuite-name))
-	 (mtexe         (common:find-local-megatest)))
-
-    (case (rmt:transport-mode)
-      ((http)(http-transport-handler runremote cmd rid params attemptnum area-dat areapath readonly-mode))
-      ((tcp) (tcp-transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
-      ((nfs) (nfs-transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
-      )))
-
-(define (nfs-transport-handler  runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)
-  (let* ((keys     (common:get-fields *configdat*))
-	 (dbstruct (dbmod:nfs-get-dbstruct run-id keys (dbfile:db-init-proc) areapath tmpadj: "/dashboard")))
-    (api:dispatch-request dbstruct cmd run-id params)))
-	 
-(define (tcp-transport-handler runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)
-  (if (not runremote)
-      (let* ((newremote  (make-and-init-remote areapath)))
-	(set! *runremote* newremote)
-	(set! runremote newremote)))
-  (let* ((dbfname (conc (dbfile:run-id->dbnum run-id)".db"))) ;;(dbfile:run-id->path areapath run-id)))
-    (tt:handler runremote cmd run-id params attemptnum area-dat areapath readonly-mode dbfname testsuite mtexe)))
+	 (mtexe         (common:find-local-megatest))
+	 (dbfname       (conc (dbfile:run-id->dbnum run-id)".db")))
+    (rmt:set-ttdat areapath ttdat)
+    (tt:handler (rmt:set-ttdat ttdat) cmd run-id params
+		attemptnum readonly-mode dbfname
+		testsuite mtexe)))
+
+;; KEEP THIS HERE FOR A WHILE, WE MAY WANT TO RESURECT IT
+;; (define (nfs-transport-handler  runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)
+;;   (let* ((keys     (common:get-fields *configdat*))
+;; 	 (dbstruct (dbmod:nfs-get-dbstruct run-id keys (dbfile:db-init-proc) areapath tmpadj: "/dashboard")))
+;;     (api:dispatch-request dbstruct cmd run-id params)))
 	
 (define (rmt:print-db-stats)
   (let ((fmtstr "~40a~7-d~9-d~20,2-f")) ;; "~20,2-f"
     (debug:print 18 *default-log-port* "DB Stats\n========")
     (debug:print 18 *default-log-port* (format #f "~40a~8a~10a~10a" "Cmd" "Count" "TotTime" "Avg"))
@@ -204,11 +174,11 @@
 	  ;; (rmt:update-db-stats run-id cmd params duration)
 	  ;; mark this run as dirty if this was a write, the watchdog is responsible for syncing it
 	  (if qry-is-write
 	      (let ((start-time (current-seconds)))
 		(mutex-lock! *db-multi-sync-mutex*)
-/		(set! *db-last-access* start-time)  ;; THIS IS PROBABLY USELESS? (we are on a client)
+		(set! *db-last-access* start-time)  ;; THIS IS PROBABLY USELESS? (we are on a client)
                 (mutex-unlock! *db-multi-sync-mutex*)))))
     res))
 
 ;;======================================================================
 ;;