moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-15 13:55:11 -05:00
Code Issues Releases Wiki Activity

Correct useragent in http queries

Browse Source 
Net struct init
This commit is contained in:
proller 2013-11-05 16:57:43 +04:00
parent 6f44492238
commit 8903c68460
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.cpp
View File

@ -48,6 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/serialize.h" #include "util/serialize.h"
#include "config.h" #include "config.h"
#include "util/directiontables.h" #include "util/directiontables.h"
#include "version.h"
#if USE_CURL #if USE_CURL
#include <curl/curl.h> #include <curl/curl.h>
@ -245,6 +246,7 @@ void * MediaFetchThread::Thread()
std::ostringstream stream; std::ostringstream stream;
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_data); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_data);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream);
curl_easy_setopt(curl, CURLOPT_USERAGENT, (std::string("Minetest ")+minetest_version_hash).c_str());
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
if (res == CURLE_OK) { if (res == CURLE_OK) {
std::string data = stream.str(); std::string data = stream.str();

2
src/convert_json.cpp
View File

@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h" #include "log.h"
#include "main.h" // for g_settings #include "main.h" // for g_settings
#include "settings.h" #include "settings.h"
#include "version.h"
#if USE_CURL #if USE_CURL
#include <curl/curl.h> #include <curl/curl.h>
@ -56,6 +57,7 @@ Json::Value fetchJsonValue(const std::string url,
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);
curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, g_settings->getS32("curl_timeout")); 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_CONNECTTIMEOUT_MS, g_settings->getS32("curl_timeout"));
curl_easy_setopt(curl, CURLOPT_USERAGENT, (std::string("Minetest ")+minetest_version_hash).c_str());
if (chunk != 0) if (chunk != 0)
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);

2
src/guiEngine.cpp
View File

@ -532,7 +532,7 @@ bool GUIEngine::downloadFile(std::string url,std::string target) {
curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, targetfile); 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); res = curl_easy_perform(curl);
if (res != CURLE_OK) { if (res != CURLE_OK) {
errorstream << "File at url \"" << url errorstream << "File at url \"" << url

2
src/serverlist.cpp
View File

@ -241,7 +241,7 @@ void sendAnnounce(std::string action, const std::vector<std::string> & clients_n
CURLcode res; CURLcode res;
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curl, CURLOPT_URL, (g_settings->get("serverlist_url")+std::string("/announce?json=")+curl_easy_escape(curl, writer.write( server ).c_str(), 0)).c_str()); curl_easy_setopt(curl, CURLOPT_URL, (g_settings->get("serverlist_url")+std::string("/announce?json=")+curl_easy_escape(curl, writer.write( server ).c_str(), 0)).c_str());
//curl_easy_setopt(curl, CURLOPT_USERAGENT, "minetest"); curl_easy_setopt(curl, CURLOPT_USERAGENT, (std::string("Minetest ")+minetest_version_hash).c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::ServerAnnounceCallback); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::ServerAnnounceCallback);
//curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring); //curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1); curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1);

9
src/socket.cpp
View File

@ -345,6 +345,8 @@ void UDPSocket::Bind(u16 port)
if(m_addr_family == AF_INET6) if(m_addr_family == AF_INET6)
{ {
struct sockaddr_in6 address; struct sockaddr_in6 address;
memset(&address, 0, sizeof(address));
address.sin6_family = AF_INET6; address.sin6_family = AF_INET6;
address.sin6_addr = in6addr_any; address.sin6_addr = in6addr_any;
address.sin6_port = htons(port); address.sin6_port = htons(port);
@ -360,6 +362,8 @@ void UDPSocket::Bind(u16 port)
else else
{ {
struct sockaddr_in address; struct sockaddr_in address;
memset(&address, 0, sizeof(address));
address.sin_family = AF_INET; address.sin_family = AF_INET;
address.sin_addr.s_addr = INADDR_ANY; address.sin_addr.s_addr = INADDR_ANY;
address.sin_port = htons(port); address.sin_port = htons(port);
@ -454,6 +458,7 @@ int UDPSocket::Receive(Address & sender, void * data, int size)
if(m_addr_family == AF_INET6) if(m_addr_family == AF_INET6)
{ {
struct sockaddr_in6 address; struct sockaddr_in6 address;
memset(&address, 0, sizeof(address));
socklen_t address_len = sizeof(address); socklen_t address_len = sizeof(address);
received = recvfrom(m_handle, (char *) data, received = recvfrom(m_handle, (char *) data,
@ -470,6 +475,8 @@ int UDPSocket::Receive(Address & sender, void * data, int size)
else else
{ {
struct sockaddr_in address; struct sockaddr_in address;
memset(&address, 0, sizeof(address));
socklen_t address_len = sizeof(address); socklen_t address_len = sizeof(address);
received = recvfrom(m_handle, (char *) data, received = recvfrom(m_handle, (char *) data,
@ -568,5 +575,3 @@ bool UDPSocket::WaitData(int timeout_ms)
// There is data // There is data
return true; return true;
} }