dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21334) -Fix [FS#4271]: make (more) sure that the savegame and transferred file are the same file and not different ones

Browse Source
This commit is contained in:
rubidium
2010-11-26 22:25:02 +00:00
parent c9a186c9ff
commit 67f74559fc
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/network_server.cpp
View File

@@ -371,22 +371,23 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap()
}
if (this->status == STATUS_AUTHORIZED) {
const char *filename = "network_server.tmp";
Packet *p;
char filename[MAX_PATH];
FioGetDirectory(filename, lengthof(filename), AUTOSAVE_DIR);
strecat(filename, "network_server.tmp", lastof(filename));
/* Make a dump of the current game */
if (SaveOrLoad(filename, SL_SAVE, AUTOSAVE_DIR) != SL_OK) usererror("network savedump failed");
if (SaveOrLoad(filename, SL_SAVE, NO_DIRECTORY) != SL_OK) usererror("network savedump failed");
if (file_pointer != NULL) fclose(file_pointer);
file_pointer = FioFOpenFile(filename, "rb", AUTOSAVE_DIR);
file_pointer = FioFOpenFile(filename, "rb", NO_DIRECTORY);
if (file_pointer == NULL) usererror("network savedump failed - could not open just saved dump");
fseek(file_pointer, 0, SEEK_END);
if (ftell(file_pointer) == 0) usererror("network savedump failed - zero sized savegame?");
/* Now send the _frame_counter and how many packets are coming */
p = new Packet(PACKET_SERVER_MAP_BEGIN);
Packet *p = new Packet(PACKET_SERVER_MAP_BEGIN);
p->Send_uint32(_frame_counter);
p->Send_uint32(ftell(file_pointer));
this->Send_Packet(p);