scsh-conservatory
/
sunet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that bind is fixed in scsh we can drop internet-address/any. 

Use scsh's new port->socket to determine the address of the host via
the session-control-input-port.
This commit is contained in:
mainzelm 2001-06-20 16:21:41 +00:00
parent 899a7d6f30
commit 2278144662
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ftpd.scm
View File

@ -480,9 +480,8 @@
(set-socket-option socket level/socket socket/reuse-address #t) (set-socket-option socket level/socket socket/reuse-address #t)
;; kludge
(bind-socket socket (bind-socket socket
(internet-address->socket-address internet-address/any (internet-address->socket-address (this-host-address)
0)) 0))
(listen-socket socket 1) (listen-socket socket 1)
@ -499,12 +498,14 @@
(format-internet-host-address host-address ",") (format-internet-host-address host-address ",")
(format-port port)))))))) (format-port port))))))))
;; This doesn't look right. But I can't look into the socket of the
;; control connection if we're running under inetd---there's no way to
;; coerce a port to a socket as there is in C.
(define (this-host-address) (define (this-host-address)
(car (host-info:addresses (host-info (system-name))))) (call-with-values
(lambda ()
(socket-address->internet-address
(socket-local-address (port->socket (session-control-input-port)
protocol-family/internet))))
(lambda (host-address control-port)
host-address)))
(define (format-internet-host-address address . maybe-separator) (define (format-internet-host-address address . maybe-separator)
@ -810,7 +811,7 @@
; Version ; Version
(define *ftpd-version* "$Revision: 1.15 $") (define *ftpd-version* "$Revision: 1.16 $")
(define (copy-port->port-binary input-port output-port) (define (copy-port->port-binary input-port output-port)
(let ((buffer (make-string *window-size*))) (let ((buffer (make-string *window-size*)))