me
/
guix
Archived
1
0
Fork 0
Code

ftp-client: Before 'PASV', try 'EPSV' first for IPv6. 

This fixes <https://bugs.gnu.org/46481>.

* guix/ftp-client.scm (ftp-epsv, ftp-passive): New procedures.
(ftp-list, ftp-retr): Replace call to 'ftp-pasv' with 'ftp-passive'.
master
宋文武 2021-02-14 12:02:57 +08:00
parent 392e230d5e
commit 858898e348
No known key found for this signature in database
GPG Key ID: D415BF253B515976
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
guix/ftp-client.scm
View File

@ -216,6 +216,17 @@ TIMEOUT, an ETIMEDOUT error is raised."
(else (else
(throw 'ftp-error conn "PASV" 227 message))))) (throw 'ftp-error conn "PASV" 227 message)))))
(define (ftp-epsv conn)
(let* ((message (%ftp-command "EPSV" 229 (ftp-connection-socket conn))))
(string->number
(match:substring (string-match "\\(...([0-9]+).\\)" message) 1))))
(define (ftp-passive conn)
"Enter passive mode using EPSV or PASV, return a data connection port on
success."
;; IPv6 only works with EPSV, so try it first.
(or (false-if-exception (ftp-epsv conn)) (ftp-pasv conn)))
(define (address-with-port sa port) (define (address-with-port sa port)
"Return a socket-address object based on SA, but with PORT." "Return a socket-address object based on SA, but with PORT."
(let ((fam (sockaddr:fam sa)) (let ((fam (sockaddr:fam sa))
@ -232,7 +243,7 @@ TIMEOUT, an ETIMEDOUT error is raised."
(if directory (if directory
(ftp-chdir conn directory)) (ftp-chdir conn directory))
(let* ((port (ftp-pasv conn)) (let* ((port (ftp-passive conn))
(ai (ftp-connection-addrinfo conn)) (ai (ftp-connection-addrinfo conn))
(s (socket (addrinfo:fam ai) (addrinfo:socktype ai) (s (socket (addrinfo:fam ai) (addrinfo:socktype ai)
(addrinfo:protocol ai)))) (addrinfo:protocol ai))))
@ -281,7 +292,7 @@ must be closed before CONN can be used for other purposes."
;; Ask for "binary mode". ;; Ask for "binary mode".
(%ftp-command "TYPE I" 200 (ftp-connection-socket conn)) (%ftp-command "TYPE I" 200 (ftp-connection-socket conn))
(let* ((port (ftp-pasv conn)) (let* ((port (ftp-passive conn))
(ai (ftp-connection-addrinfo conn)) (ai (ftp-connection-addrinfo conn))
(s (with-fluids ((%default-port-encoding #f)) (s (with-fluids ((%default-port-encoding #f))
(socket (addrinfo:fam ai) (addrinfo:socktype ai) (socket (addrinfo:fam ai) (addrinfo:socktype ai)