diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/internet.cc | 15 | ||||
| -rw-r--r-- | src/lib/internet.h | 8 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/lib/internet.cc b/src/lib/internet.cc index 4eba1efa3..e0af49b66 100644 --- a/src/lib/internet.cc +++ b/src/lib/internet.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -48,7 +48,7 @@ get_from_url_data (void* buffer, size_t size, size_t nmemb, void* stream) } optional<string> -get_from_url (string url, bool pasv, ScopedTemporary& temp) +get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp) { CURL* curl = curl_easy_init (); curl_easy_setopt (curl, CURLOPT_URL, url.c_str()); @@ -58,6 +58,9 @@ get_from_url (string url, bool pasv, ScopedTemporary& temp) 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 (skip_pasv_ip) { + curl_easy_setopt (curl, CURLOPT_FTP_SKIP_PASV_IP, 1); + } if (!pasv) { curl_easy_setopt (curl, CURLOPT_FTPPORT, "-"); } @@ -77,10 +80,10 @@ get_from_url (string url, bool pasv, ScopedTemporary& temp) } optional<string> -get_from_url (string url, bool pasv, function<void (boost::filesystem::path)> load) +get_from_url (string url, bool pasv, bool skip_pasv_ip, function<void (boost::filesystem::path)> load) { ScopedTemporary temp; - optional<string> e = get_from_url (url, pasv, temp); + optional<string> e = get_from_url (url, pasv, skip_pasv_ip, temp); if (e) { return e; } @@ -93,11 +96,11 @@ get_from_url (string url, bool pasv, function<void (boost::filesystem::path)> lo * @param load Function passed a (temporary) filesystem path of the unpacked file. */ optional<string> -get_from_zip_url (string url, string file, bool pasv, function<void (boost::filesystem::path)> load) +get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<void (boost::filesystem::path)> load) { /* Download the ZIP file to temp_zip */ ScopedTemporary temp_zip; - optional<string> e = get_from_url (url, pasv, temp_zip); + optional<string> e = get_from_url (url, pasv, skip_pasv_ip, temp_zip); if (e) { return e; } diff --git a/src/lib/internet.h b/src/lib/internet.h index 101eaeae9..125533b5d 100644 --- a/src/lib/internet.h +++ b/src/lib/internet.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -24,6 +24,6 @@ class ScopedTemporary; -boost::optional<std::string> get_from_url (std::string url, bool pasv, ScopedTemporary& temp); -boost::optional<std::string> get_from_url (std::string url, bool pasv, boost::function<void (boost::filesystem::path)> load); -boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, boost::function<void (boost::filesystem::path)> load); +boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp); +boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load); +boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load); |