From 0d990bd189881a9a6c829e1c9ec17b2dc5ac12c8 Mon Sep 17 00:00:00 2001 From: sapier Date: Sat, 9 Nov 2013 22:49:27 +0100 Subject: [PATCH] Replace any direct curl usage by httpfetch --- minetest.conf.example | 1 - src/convert_json.cpp | 54 +++++++++++++---------------------------- src/guiEngine.cpp | 53 ++++++++++++++++------------------------ src/guiFormSpecMenu.cpp | 14 +---------- src/httpfetch.cpp | 1 + src/httpfetch.h | 2 ++ 6 files changed, 42 insertions(+), 83 deletions(-) diff --git a/minetest.conf.example b/minetest.conf.example index 59d8b32fb..f7dac6b7b 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -198,7 +198,6 @@ # - Media fetch if server uses remote_media setting # - Serverlist download and server announcement # - Downloads performed by main menu (e.g. mod manager) -# - Downloads performed by mods (minetest.httpfetch) # Only has an effect if compiled with cURL #curl_parallel_limit = 8 diff --git a/src/convert_json.cpp b/src/convert_json.cpp index 0b69f43a3..dbf0a82ac 100644 --- a/src/convert_json.cpp +++ b/src/convert_json.cpp @@ -28,58 +28,38 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "main.h" // for g_settings #include "settings.h" #include "version.h" - -#if USE_CURL -#include - -static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) -{ - ((std::string*)userp)->append((char*)contents, size * nmemb); - return size * nmemb; -} - -#endif +#include "httpfetch.h" Json::Value fetchJsonValue(const std::string url, struct curl_slist *chunk) { #if USE_CURL - std::string liststring; - CURL *curl; - curl = curl_easy_init(); - if (curl) - { - CURLcode res; + HTTPFetchRequest fetchrequest; + HTTPFetchResult fetchresult; + fetchrequest.url = url; + fetchrequest.useragent = std::string("Minetest ")+minetest_version_hash; + fetchrequest.timeout = g_settings->getS32("curl_timeout"); + fetchrequest.caller = HTTPFETCH_SYNC; - curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring); - curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, g_settings->getS32("curl_timeout")); - curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, g_settings->getS32("curl_timeout")); - curl_easy_setopt(curl, CURLOPT_USERAGENT, (std::string("Minetest ")+minetest_version_hash).c_str()); - - if (chunk != 0) - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk); - - res = curl_easy_perform(curl); - if (res != CURLE_OK) - errorstream<<"Jsonreader: "<< url <<" not found (" << curl_easy_strerror(res) << ")" <data); + runptr = runptr->next; } + httpfetch_sync(fetchrequest,fetchresult); - Json::Value root; - Json::Reader reader; - std::istringstream stream(liststring); - if (!liststring.size()) { + if (!fetchresult.succeeded) { return Json::Value(); } + Json::Value root; + Json::Reader reader; + std::istringstream stream(fetchresult.data); if (!reader.parse( stream, root ) ) { errorstream << "URL: " << url << std::endl; errorstream << "Failed to parse json data " << reader.getFormattedErrorMessages(); - errorstream << "data: \"" << liststring << "\"" << std::endl; + errorstream << "data: \"" << fetchresult.data << "\"" << std::endl; return Json::Value(); } diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index d008b2568..0ec68e3ae 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "sound.h" #include "sound_openal.h" #include "clouds.h" +#include "httpfetch.h" #include #include @@ -507,51 +508,39 @@ bool GUIEngine::setTexture(texture_layer layer,std::string texturepath) { } /******************************************************************************/ -#if USE_CURL -static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) -{ - FILE* targetfile = (FILE*) userp; - fwrite(contents,size,nmemb,targetfile); - return size * nmemb; -} -#endif bool GUIEngine::downloadFile(std::string url,std::string target) { #if USE_CURL - //download file via curl - CURL *curl; + bool retval = true; - curl = curl_easy_init(); + FILE* targetfile = fopen(target.c_str(),"wb"); - if (curl) - { - CURLcode res; - bool retval = true; + if (targetfile) { + HTTPFetchRequest fetchrequest; + HTTPFetchResult fetchresult; + fetchrequest.url = url; + fetchrequest.useragent = std::string("Minetest ")+minetest_version_hash; + fetchrequest.timeout = g_settings->getS32("curl_timeout"); + fetchrequest.caller = HTTPFETCH_SYNC; + httpfetch_sync(fetchrequest,fetchresult); - FILE* targetfile = fopen(target.c_str(),"wb"); - - if (targetfile) { - curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, targetfile); - curl_easy_setopt(curl, CURLOPT_USERAGENT, (std::string("Minetest ")+minetest_version_hash).c_str()); - res = curl_easy_perform(curl); - if (res != CURLE_OK) { - errorstream << "File at url \"" << url - <<"\" not found (" << curl_easy_strerror(res) << ")" <OnEvent(event) : false; } -static inline bool hex_digit_decode(char hexdigit, unsigned char &value) -{ - if(hexdigit >= '0' && hexdigit <= '9') - value = hexdigit - '0'; - else if(hexdigit >= 'A' && hexdigit <= 'F') - value = hexdigit - 'A' + 10; - else if(hexdigit >= 'a' && hexdigit <= 'f') - value = hexdigit - 'a' + 10; - else - return false; - return true; -} - bool GUIFormSpecMenu::parseColor(std::string &value, video::SColor &color, bool quiet) { const char *hexpattern = NULL; diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp index 25474c725..64e77bc54 100644 --- a/src/httpfetch.cpp +++ b/src/httpfetch.cpp @@ -280,6 +280,7 @@ struct HTTPFetchOngoing if (curl != NULL) { if (curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &result.response_code) != CURLE_OK) { + //we failed to get a return code make sure it is still 0 result.response_code = 0; } } diff --git a/src/httpfetch.h b/src/httpfetch.h index 6eb01fe79..f06c50e2c 100644 --- a/src/httpfetch.h +++ b/src/httpfetch.h @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., // Can be used in place of "caller" in asynchronous transfers to discard result // (used as default value of "caller") #define HTTPFETCH_DISCARD 0 +#define HTTPFETCH_SYNC 1 struct HTTPFetchRequest { @@ -96,6 +97,7 @@ struct HTTPFetchResult caller = fetchrequest.caller; request_id = fetchrequest.request_id; } + }; // Initializes the httpfetch module