Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -30,11 +30,11 @@
    ezsteps.scm lock-queue.scm sdb.scm \
    rmt.scm api.scm subrun.scm \
    portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm 
 
 # module source files
-MSRCFILES = ftail.scm
+MSRCFILES = ftail.scm rmtmod.scm
 
 # Eggs to install (straightforward ones)
 EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \
 dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \
 json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \
@@ -71,11 +71,11 @@
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
 
-mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o
+mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o mofiles/rmtmod.o
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
@@ -83,12 +83,12 @@
 	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o dboard
 
 ndboard : newdashboard.scm $(OFILES) $(GOFILES)
 	csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
 
-mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm
-	csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
+mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm
+	csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut
 
 TCMTOBJS = \
 	api.o \
 	archive.o \
 	cgisetup/models/pgdb.o \
@@ -107,11 +107,12 @@
 	megatest-version.o \
 	ods.o \
 	portlogger.o \
 	process.o \
 	rmt.o \
-	rpc-transport.o \
+        mofiles/rmtmod.o \
+        rpc-transport.o \
 	runconfig.o \
 	runs.o \
 	server.o \
 	tasks.o \
 	tdb.o \

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -22,10 +22,13 @@
 
 (declare (unit rmt))
 (declare (uses api))
 (declare (uses http-transport))
 (include "common_records.scm")
+(declare (uses rmtmod))
+
+(import rmtmod)
 
 ;;
 ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
 ;;
 
@@ -282,55 +285,10 @@
 	;; there was a detected issue at the other end
 	(extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res)
 	(extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
 	)))
 
-(define (extras-readonly-mode rmt-mutex log-port cmd params)
-  (mutex-unlock! rmt-mutex)
-  (debug:print-info 12 log-port "rmt:send-receive, case 3")
-  (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
-  #f)
-
-(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
-  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-  (mutex-lock! *rmt-mutex*)
-  (remote-conndat-set!    runremote #f)
-  (http-transport:close-connections area-dat: runremote)
-  (remote-server-url-set! runremote #f)
-  (mutex-unlock! *rmt-mutex*)
-  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
-  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-  
-(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res)
-  (if (and (vector? res)
-	   (eq? (vector-length res) 2)
-	   (eq? (vector-ref res 1) 'overloaded)) ;; since we are
-						 ;; looking at the
-						 ;; data to carry the
-						 ;; error we'll use a
-						 ;; fairly obtuse
-						 ;; combo to minimise
-						 ;; the chances of
-						 ;; some sort of
-						 ;; collision.  this
-						 ;; is the case where
-						 ;; the returned data
-						 ;; is bad or the
-						 ;; server is
-						 ;; overloaded and we
-						 ;; want to ease off
-						 ;; the queries
-      (let ((wait-delay (+ attemptnum (* attemptnum 10))))
-	(debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
-	(mutex-lock! *rmt-mutex*)
-	(http-transport:close-connections area-dat: runremote)
-	(set! *runremote* #f) ;; force starting over
-	(mutex-unlock! *rmt-mutex*)
-	(thread-sleep! wait-delay)
-	(rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-      res)) ;; All good, return res
-
 ;; (define (rmt:update-db-stats run-id rawcmd params duration)
 ;;   (mutex-lock! *db-stats-mutex*)
 ;;   (handle-exceptions
 ;;    exn
 ;;    (begin
@@ -982,5 +940,8 @@
 (define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
   (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
 
 (define (rmt:test-get-archive-block-info archive-block-id)
   (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
+
+(set-functions rmt:send-receive remote-server-url-set! http-transport:close-connections
+	       remote-conndat-set! debug:print debug:print-info)

ADDED   rmtmod.scm
Index: rmtmod.scm
==================================================================
--- /dev/null
+++ rmtmod.scm
@@ -0,0 +1,90 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit rmtmod))
+
+(module rmtmod
+	*
+	
+(import scheme chicken data-structures extras)
+(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
+
+(define (rmt:send-receive . params) #f)
+(define (remote-server-url-set! . params) #f)
+(define (http-transport:close-connections . params) #f)
+(define (remote-conndat-set! . params) #f)
+(define (debug:print . params) #f)
+(define (debug:print-info . params) #f)
+
+(define (set-functions send-receive rsus close-connections rcs dbgp dbgpinfo) 
+  (set! rmt:send-receive send-receive)
+  (set! remote-server-url-set! rsus)
+  (set! http-transport:close-connections close-connections)
+  (set! remote-conndat-set! rcs)
+  (set! debug:print dbgp)
+  (set! debug:print-info dbgpinfo))
+
+
+(define (extras-readonly-mode rmt-mutex log-port cmd params)
+  (mutex-unlock! rmt-mutex)
+  (debug:print-info 12 log-port "rmt:send-receive, case 3")
+  (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
+  #f)
+
+(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
+  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
+  (mutex-lock! *rmt-mutex*)
+  (remote-conndat-set!    runremote #f)
+  (http-transport:close-connections area-dat: runremote)
+  (remote-server-url-set! runremote #f)
+  (mutex-unlock! *rmt-mutex*)
+  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
+  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+  
+(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+  (if (and (vector? res)
+	   (eq? (vector-length res) 2)
+	   (eq? (vector-ref res 1) 'overloaded)) ;; since we are
+						 ;; looking at the
+						 ;; data to carry the
+						 ;; error we'll use a
+						 ;; fairly obtuse
+						 ;; combo to minimise
+						 ;; the chances of
+						 ;; some sort of
+						 ;; collision.  this
+						 ;; is the case where
+						 ;; the returned data
+						 ;; is bad or the
+						 ;; server is
+						 ;; overloaded and we
+						 ;; want to ease off
+						 ;; the queries
+      (let ((wait-delay (+ attemptnum (* attemptnum 10))))
+	(debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
+	(mutex-lock! *rmt-mutex*)
+	(http-transport:close-connections area-dat: runremote)
+	(set! *runremote* #f) ;; force starting over
+	(mutex-unlock! *rmt-mutex*)
+	(thread-sleep! wait-delay)
+	(rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+      res)) ;; All good, return res
+
+)