summaryrefslogtreecommitdiff
path: root/src/filecache.h
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2013-08-29 05:22:18 +0200
committerKahrl <kahrl@gmx.net>2013-12-13 18:05:20 +0100
commit0404bbf67196e83d04620180e704916671371ca1 (patch)
tree8d175d3dda1a69a1f66e636f2ca268101b271a14 /src/filecache.h
parent0ea3e6dbe2288854d9d4a971fc6539c2e740a95a (diff)
downloadminetest-0404bbf67196e83d04620180e704916671371ca1.tar.gz
minetest-0404bbf67196e83d04620180e704916671371ca1.tar.bz2
minetest-0404bbf67196e83d04620180e704916671371ca1.zip
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other things, this class does the following things: - Download [remote_server][sha1] instead of [remote_server][name]. This is to support servers that provide the same file name with different contents. - Initially fetch [remote_server]index.mth. This file should follow the Minetest Hashset format (currently version 1) and contain a list of SHA1 hashes that exist on the server. - The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is requested, so servers can optionally narrow down the list to the needs of the client. - If index.mth is missing (HTTP response code 404), we enter compat mode, fetching [remote_server][name] as before this commit. - remote_server can now contain multiple servers, separated by commas. The downloader code attempts to split requests between the different servers, as permitted by each server's index.mth. If one server claims to have a file but actually doesn't (or something fails), we ask a different server that also claims to have it. - As before, when none of the remote servers provide a particular file, we download it via the conventional method, i.e. using the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA. - Bugfix: Every downloaded file's SHA1 is now verified against the SHA1 announced by the minetest server (before loading it and inserting it into the file cache). - Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all media. This should fix #863.
Diffstat (limited to 'src/filecache.h')
-rw-r--r--src/filecache.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/filecache.h b/src/filecache.h
index cf59a8e5b..a913a06ac 100644
--- a/src/filecache.h
+++ b/src/filecache.h
@@ -36,9 +36,7 @@ public:
}
bool update(const std::string &name, const std::string &data);
- bool update_sha1(const std::string &data);
bool load(const std::string &name, std::ostream &os);
- bool load_sha1(const std::string &sha1_raw, std::ostream &os);
private:
std::string m_dir;