Index: tcp-transportmod.scm ================================================================== --- tcp-transportmod.scm +++ tcp-transportmod.scm @@ -21,10 +21,12 @@ (declare (unit tcp-transportmod)) (declare (uses debugprint)) (declare (uses commonmod)) (declare (uses dbfile)) (declare (uses dbmod)) + +(use address-info) (module tcp-transportmod * (import scheme @@ -67,10 +69,11 @@ ;; (define keep-age-param (make-parameter 10)) ;; qif file age, if over move to attic (defstruct tt-conn host port + host-port dbfname server-id server-start pid ) @@ -205,20 +208,10 @@ (tt:keep-running ttdat dbfname handler)) (begin (debug:print 0 *default-log-port* "INFO: found server(s) already running for db "dbfname", "(string-intersperse servers ",")" Exiting.") (exit))))) -;; find a port and start tcp-server -;; -(define (tt:start-tcp-server ttdat) - (setup-listener ttdat) - (let* ((socket (tt-socket ttdat)) - (handler (tt-handler ttdat))) - ((make-tcp-server socket handler) - #t ;; yes, send error messages to std-err - ))) - (define (tt:keep-running ttdat dbfile) ;; verfiy conn for ready ;; listener socket has been started by this stage (debug:print 0 *default-log-port* "INFO: Got here!!!!")) @@ -385,16 +378,26 @@ exn (if (< port 65535) (setup-listener uconn (+ port 1)) #f) (connect-listener uconn port))) + +;; find a port and start tcp-server +;; +(define (tt:start-tcp-server ttdat) + (setup-listener ttdat) + (let* ((socket (tt-socket ttdat)) + (handler (tt-handler ttdat))) + ((make-tcp-server socket handler) + #t ;; yes, send error messages to std-err + ))) (define (connect-listener uconn port) ;; (tcp-listener-socket LISTENER)(socket-name so) ;; sockaddr-address, sockaddr-port, sockaddr->string (let* ((tlsn (tcp-listen port 1000 #f)) ;; (tcp-listen TCPPORT [BACKLOG [HOST]]) - (addr (get-my-best-address))) ;; (hostinfo-addresses (host-information (current-hostname))) + (addr (tt:get-best-guess-address (get-host-name)))) ;; (get-my-best-address))) ;; (hostinfo-addresses (host-information (current-hostname))) (tt-port-set! uconn port) (tt-host-port-set! uconn (conc addr":"port)) (tt-socket-set! uconn tlsn) uconn))