@@ -11,22 +11,41 @@
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 (import (prefix sqlite3 sqlite3:))
 
-;; (use nanomsg)
+(use nanomsg)
 
 (declare (unit nmsg-transport))
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))
+(declare (uses portlogger))
 
 (include "common_records.scm")
 (include "db_records.scm")
+
+(define (make-http-transport:server-dat)(make-vector 6))
+(define (http-transport:server-dat-get-iface         vec)    (vector-ref  vec 0))
+(define (http-transport:server-dat-get-port          vec)    (vector-ref  vec 1))
+(define (http-transport:server-dat-get-api-uri       vec)    (vector-ref  vec 2))
+(define (http-transport:server-dat-get-api-url       vec)    (vector-ref  vec 3))
+(define (http-transport:server-dat-get-api-req       vec)    (vector-ref  vec 4))
+(define (http-transport:server-dat-get-last-access   vec)    (vector-ref  vec 5))
+(define (http-transport:server-dat-get-socket        vec)    (vector-ref  vec 6))
+
+(define (http-transport:server-dat-make-url vec)
+  (if (and (http-transport:server-dat-get-iface vec)
+	   (http-transport:server-dat-get-port  vec))
+      (conc "http://" 
+	    (http-transport:server-dat-get-iface vec)
+	    ":"
+	    (http-transport:server-dat-get-port  vec))
+      #f))
 
 ;; Transition to pub --> sub with pull <-- push
 ;;
 ;;   1. client sends request to server via push to the pull port
 ;;   2. server puts request in queue or processes immediately as appropriate
@@ -56,10 +75,11 @@
       #f
       (conc "tcp://" (if bindall "*" (car hostport)) ":" (cadr hostport))))
 
 (define *server-loop-heart-beat* (current-seconds))
 (define *heartbeat-mutex* (make-mutex))
+(define *nmsg-mutex* (make-mutex))
 
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
 
@@ -280,11 +300,11 @@
 			       (* 60 60 (string->number tmo))
 			       ;; (* 3 24 60 60) ;; default to three days
 			       (* 60 1)         ;; default to one minute
 			       ;; (* 60 60 25)      ;; default to 25 hours
 			       ))))
-    (print "Keep-running got server pid " server-id ", using iface " iface " and port " port)
+    (print "Keep-running got server pid " server-id ", using iface " iface " and port " port " and transport of " *transport-type*)
     (let loop ((count 0))
       (thread-sleep! 4) ;; no need to do this very often
       ;; NB// sync currently does NOT return queue-length
       (let () ;; (queue-len (cdb:client-call server-info 'sync #t 1)))
       ;; (print "Server running, count is " count)
@@ -321,17 +341,17 @@
 ;; returns result, there is no sucess/fail flag - handled via excpections
 ;;
 (define (nmsg-transport:client-api-send-receive run-id connection-info cmd param #!key (remtries 5))
   ;; NB// In the html version of this routine there is a call to 
   ;;      tasks:kill-server-run-id when there is an exception
-  (mutex-lock! *http-mutex*)
+  (mutex-lock! *nmsg-mutex*)
   (let* ((packet  (vector cmd param))
 	 (reqsoc  (http-transport:server-dat-get-socket connection-info))
 	 (res     (nmsg-transport:client-api-send-receive-raw reqsoc packet)))
 ;;	 (status  (vector-ref rawres 0))
 ;;	 (result  (vector-ref rawres 1)))
-    (mutex-unlock! *http-mutex*)
+    (mutex-unlock! *nmsg-mutex*)
     res)) ;; (vector status (if status (db:string->obj result transport: 'nmsg) result))))
 	
 ;;======================================================================
 ;; J U N K 
 ;;======================================================================