X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Finternet.cc;h=5a909e470088470e558a4c0461ce5889dcf96f9e;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=2b1e90ca7c030366652ec38cb625bc3cd0798ac9;hpb=ee1d68bbbfe89b3aa131d912747e5da4a746fdce;p=dcpomatic.git

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index 2b1e90ca7..5a909e470 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -49,7 +50,7 @@ get_from_zip_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
  *  @param load Function passed a (temporary) filesystem path of the unpacked file.
  */
 optional<string>
-get_from_zip_url (string url, string file, function<void (boost::filesystem::path)> load)
+get_from_zip_url (string url, string file, bool pasv, function<void (boost::filesystem::path)> load)
 {
 	/* Download the ZIP file to temp_zip */
 	CURL* curl = curl_easy_init ();
@@ -60,6 +61,11 @@ get_from_zip_url (string url, string file, function<void (boost::filesystem::pat
 	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_zip_url_data);
 	curl_easy_setopt (curl, CURLOPT_WRITEDATA, f);
 	curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
+	curl_easy_setopt (curl, CURLOPT_FTP_USE_EPRT, 0);
+	if (!pasv) {
+		curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
+	}
+
 	/* Maximum time is 20s */
 	curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20);
 
@@ -99,7 +105,6 @@ get_from_zip_url (string url, string file, function<void (boost::filesystem::pat
 	return optional<string> ();
 }
 
-
 static size_t
 ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
 {
@@ -108,7 +113,7 @@ ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
 	for (size_t i = 0; i < (size * nmemb); ++i) {
 		*s += b[i];
 	}
-	return nmemb;
+	return size * nmemb;
 }
 
 list<string>
@@ -133,8 +138,10 @@ ftp_ls (string url, bool pasv)
 	curl_easy_setopt (curl, CURLOPT_WRITEDATA, &ls_raw);
 	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ftp_ls_data);
 	curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
+	curl_easy_setopt (curl, CURLOPT_FTP_USE_EPRT, 0);
+	curl_easy_setopt (curl, CURLOPT_VERBOSE, 1);
 	if (!pasv) {
-		curl_easy_setopt (curl, CURLOPT_FTPPORT, "");
+		curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
 	}
 	CURLcode const r = curl_easy_perform (curl);
 	if (r != CURLE_OK) {