Various improvements in robustness / neatness of certificate download stuff.

3 files changed, 17 insertions, 12 deletions

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index 7bc818717..2b1e90ca7 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -17,16 +17,17 @@
 
 */
 
-#include <string>
+#include "scoped_temporary.h"
+#include "compose.hpp"
+#include "safe_stringstream.h"
+#include "exceptions.h"
+#include <curl/curl.h>
+#include <zip.h>
 #include <boost/function.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <curl/curl.h>
-#include <zip.h>
-#include "scoped_temporary.h"
-#include "compose.hpp"
-#include "safe_stringstream.h"
+#include <string>
 
 #include "i18n.h"
 
@@ -111,11 +112,11 @@ ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
 }
 
 list<string>
-ftp_ls (string url)
+ftp_ls (string url, bool pasv)
 {
 	CURL* curl = curl_easy_init ();
 	if (!curl) {
-		return list<string> ();
+		throw NetworkError ("could not set up curl");
 	}
 
 	if (url.substr (url.length() - 1, 1) != "/") {
@@ -132,9 +133,13 @@ ftp_ls (string url)
 	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);
+	if (!pasv) {
+		curl_easy_setopt (curl, CURLOPT_FTPPORT, "");
+	}
 	CURLcode const r = curl_easy_perform (curl);
 	if (r != CURLE_OK) {
-		return list<string> ();
+		curl_easy_cleanup (curl);
+		throw NetworkError (curl_easy_strerror (r));
 	}
 
 	SafeStringStream s (ls_raw);
diff --git a/src/lib/internet.h b/src/lib/internet.h
index d7427fe48..f46abc367 100644
--- a/src/lib/internet.h
+++ b/src/lib/internet.h
@@ -22,4 +22,4 @@
 #include <boost/filesystem.hpp>
 
 boost::optional<std::string> get_from_zip_url (std::string url, std::string file, boost::function<void (boost::filesystem::path)> load);
-std::list<std::string> ftp_ls (std::string dir);
+std::list<std::string> ftp_ls (std::string dir, bool pasv = true);
diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index b8d892c41..62afacade 100644
--- a/src/lib/signal_manager.h
+++ b/src/lib/signal_manager.h
@@ -46,8 +46,8 @@ public:
 
 	/** Call this in the UI when it is idle */
 	size_t ui_idle () {
-		/* This executes any functors that have been post()ed to _service */
-		return _service.poll ();
+		/* This executes one of the functors that has been post()ed to _service */
+		return _service.poll_one ();
 	}
 
 	/** This should wake the UI and make it call ui_idle() */