upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 23:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

campaignd: Implement client-specified update target in [request_campaign]

Browse Source 
The previous implementation here didn't actually use the from/to version
bounds when building the delta pack sequence. So... let's fix that so
people aren't forced to receive a bogus delta that invariably contains
the changes from the earliest uploaded version to the latest.
This commit is contained in:
Iris Morelle 2020-11-17 19:46:08 -03:00
parent 352cbc32ec
commit fbf472f1b4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/campaignd/server.cpp
View File

@ -964,7 +964,16 @@ void server::handle_request_campaign(const server::request& req)
int delivery_size = 0;
bool force_use_full = false;
for(auto iter = version_map.begin(); !force_use_full && std::distance(iter, version_map.end()) > 1;) {
auto start_point = version_map.find(version_info{from}); // Already known to exist
auto end_point = std::next(to_version_iter, 1); // May be end()
if(std::distance(start_point, end_point) <= 1) {
// This should not happen, skip the sequence build entirely
ERR_CS << "Bad update sequence bounds in version " << from << " -> " << to << " update sequence for the add-on '" << name << "', sending a full pack instead\n";
force_use_full = true;
}
for(auto iter = start_point; !force_use_full && std::distance(iter, end_point) > 1;) {
const auto& prev_version_cfg = iter->second;
const auto& next_version_cfg = (++iter)->second;