BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Remove remote media compatibility mode. (#8044)

Browse Source 
The fallback code shouldn't be needed and is a remnant of the GET
method that old media servers use. Clients using it are likely
to just waste bandwidth and having to download the media again
through the normal transfer from server method. The most reliable
method is to get all missing textures therefore from the server
directly and not spam the remote media server with 404s.
This commit is contained in:
sofar 2019-01-03 15:26:08 -08:00 committed by Loïc Blot
parent bba4563d89
commit cf224c9d6b
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/client/clientmedia.cpp
View File

@ -105,7 +105,6 @@ void ClientMediaDownloader::addRemoteServer(const std::string &baseurl)
RemoteServerStatus *remote = new RemoteServerStatus(); RemoteServerStatus *remote = new RemoteServerStatus();
remote->baseurl = baseurl; remote->baseurl = baseurl;
remote->active_count = 0; remote->active_count = 0;
remote->request_by_filename = false;
m_remotes.push_back(remote); m_remotes.push_back(remote);
} }
@ -299,28 +298,6 @@ void ClientMediaDownloader::remoteHashSetReceived(
<< e.what() << std::endl; << e.what() << std::endl;
} }
} }
// For compatibility: If index.mth is not found, assume that the
// server contains files named like the original files (not their sha1)
// Do NOT check for any particular response code (e.g. 404) here,
// because different servers respond differently
if (!fetch_result.succeeded && !fetch_result.timeout) {
infostream << "Client: Enabling compatibility mode for remote "
<< "server \"" << remote->baseurl << "\"" << std::endl;
remote->request_by_filename = true;
// Assume every file is available on this server
for(std::map<std::string, FileStatus*>::iterator
it = m_files.upper_bound(m_name_bound);
it != m_files.end(); ++it) {
FileStatus *f = it->second;
if (!f->received)
f->available_remotes.push_back(remote_id);
}
}
} }
void ClientMediaDownloader::remoteMediaReceived( void ClientMediaDownloader::remoteMediaReceived(
@ -425,8 +402,7 @@ void ClientMediaDownloader::startRemoteMediaTransfers()
m_remotes[remote_id]; m_remotes[remote_id];
std::string url = remote->baseurl + std::string url = remote->baseurl +
(remote->request_by_filename ? name : hex_encode(filestatus->sha1);
hex_encode(filestatus->sha1));
verbosestream << "Client: " verbosestream << "Client: "
<< "Requesting remote media file " << "Requesting remote media file "
<< "\"" << name << "\" " << "\"" << name << "\" "

1
src/client/clientmedia.h
View File

@ -92,7 +92,6 @@ private:
struct RemoteServerStatus { struct RemoteServerStatus {
std::string baseurl; std::string baseurl;
s32 active_count; s32 active_count;
bool request_by_filename;
}; };
void initialStep(Client *client); void initialStep(Client *client);