@@ -8,13 +8,14 @@
 ;;  PURPOSE.
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos json http-client directory-utils) ;; (srfi 18) extras)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos json http-client directory-utils rpc) ;; (srfi 18) extras)
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
+(import (prefix rpc rpc:))
 
 ;; (use zmq)
 
 (declare (uses common))
 (declare (uses megatest-version))
@@ -351,12 +352,11 @@
     (let* ((run-id    (string->number (args:get-arg "-run-id")))
 	   (host-port (let ((slst (string-split   (args:get-arg "-ping") ":")))
 			(if (eq? (length slst) 2)
 			    (list (car slst)(string->number (cadr slst)))
 			    #f)))
-	   (toppath   (setup-for-run))
-	   (transport (server:get-transport)))
+	   (toppath   (setup-for-run)))
       (set! *did-something* #t)
       (if (not run-id)
 	  (begin
 	    (debug:print 0 "ERROR: must specify run-id when doing ping, -run-id n")
 	    (print "ERROR: No run-id")
@@ -364,13 +364,13 @@
 	  (if (not host-port)
 	      (begin
 		(debug:print 0 "ERROR: argument to -ping is host:port, got " (args:get-arg "-ping"))
 		(print "ERROR: bad host:port")
 		(exit 1))
-	      (case transport
+	      (case (server:get-transport)
 		((http)(http:ping run-id host-port))
-		((rpc) (rpc:ping  run-id (car host-port)(cadr host-port)))
+		((rpc)  ((rpc:procedure 'server:login (car host-port)(cadr host-port)) *toppath*)) ;; (rpc-transport:ping  run-id (car host-port)(cadr host-port)))
 		(else  (debug:print 0 "ERROR: No transport set")(exit)))))))
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
@@ -396,11 +396,12 @@
 		     equal?
 		     (hash-table-keys args:arg-hash)
 		     '("-list-servers"
 		       "-stop-server"
 		       "-show-cmdinfo"
-		       "-list-runs")))
+		       "-list-runs"
+		       "-ping")))
 	(if (setup-for-run)
 	    (let ((run-id    (and (args:get-arg "-run-id")
 				  (string->number (args:get-arg "-run-id")))))
 	      ;; (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
 	      ;; if not list or kill then start a client (if appropriate)