TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Darren Ranalli 2001-01-20 01:29:40 +00:00
parent 926f5b2982
commit cda6f2be96
5 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/express/error_utils.cxx
View File

@ -89,6 +89,8 @@ error_to_text(int err) {
return "EU_error_file_empty";
case EU_error_file_invalid:
return "EU_error_file_invalid";
case EU_error_invalid_checksum:
return "EU_error_invalid_checksum";
case EU_error_network_dead:
return "EU_error_network_dead";
case EU_error_network_unreachable:

3
panda/src/express/error_utils.h
View File

@ -16,7 +16,7 @@ enum ErrorUtilCode {
EU_network_no_data = 5,
EU_write_ram = 4,
EU_write = 3,
EU_write = 3,
EU_ok = 2,
EU_success = 1,
@ -24,6 +24,7 @@ enum ErrorUtilCode {
EU_error_abort = -1,
EU_error_file_empty = -2,
EU_error_file_invalid = -3,
EU_error_invalid_checksum = -4,
// General network errors
EU_error_network_dead = -30,

2
panda/src/express/patchfile.I
View File

@ -1,5 +1,5 @@
// Filename: patchfile.I
// Created by: mike, darren (09Jan97)
// Created by: darren, mike (09Jan97)
//
////////////////////////////////////////////////////////////////////

51
panda/src/express/patchfile.cxx
View File

@ -1,5 +1,5 @@
// Filename: patchfile.cxx
// Created by: mike, darren (09Jan97)
// Created by: darren, mike (09Jan97)
//
////////////////////////////////////////////////////////////////////
// Copyright (C) 1992,93,94,95,96,97,98
@ -19,16 +19,12 @@
#include "patchfile.h"
#include "config_express.h"
#include "error_utils.h"
#include "crypto_utils.h" // MD5 stuff
#include <stdio.h> // for tempnam
// this actually slows things down...
//#define USE_MD5_HASH
#ifdef USE_MD5_HASH
#include "crypto_utils.h"
#include "hashVal.h"
#endif
//#define USE_MD5_FOR_HASHTABLE_INDEX_VALUES
// Patch File Format ///////////////////////////////////////////////
///// IF THIS CHANGES, UPDATE installerApplyPatch.cxx IN THE INSTALLER
@ -36,6 +32,8 @@
// [ HEADER ]
// 4 bytes 0xfeebfaab ("magic number")
// 4 bytes length of resulting patched file
// 16 bytes MD5 of resultant patched file
const int _header_length = sizeof(PN_uint32) + sizeof(PN_uint32) + (4*sizeof(PN_uint32));
//
// [ ADD/COPY pairs; repeated N times ]
// 2 bytes AL = ADD length
@ -133,7 +131,7 @@ cleanup(void) {
///// PATCH FILE APPLY MEMBER FUNCTIONS
/////
////////////////////
///// NOTE: this patch-application functionality is unfortunately
///// NOTE: this patch-application functionality unfortunately has to be
///// duplicated in the Installer. It is contained in the file
///// installerApplyPatch.cxx
///// PLEASE MAKE SURE THAT THAT FILE GETS UPDATED IF ANY OF THIS
@ -149,8 +147,6 @@ cleanup(void) {
////////////////////////////////////////////////////////////////////
int Patchfile::
initiate(Filename &patch_file, Filename &file) {
const int _header_length = sizeof(PN_uint32) + sizeof(PN_uint32);
if (true == _initiated) {
express_cat.error()
<< "Patchfile::initiate() - Patching has already been initiated"
@ -215,6 +211,12 @@ initiate(Filename &patch_file, Filename &file) {
// get the length of the patched result file
_result_file_length = di.get_uint32();
// get the MD5 of the resultant patched file
_MD5_ofResult.set_value(0, di.get_uint32());
_MD5_ofResult.set_value(1, di.get_uint32());
_MD5_ofResult.set_value(2, di.get_uint32());
_MD5_ofResult.set_value(3, di.get_uint32());
express_cat.debug()
<< "Patchfile::initiate() - valid patchfile" << endl;
/*
@ -324,11 +326,24 @@ run(void) {
//cout << _result_file_length << " " << _total_bytes_processed << endl;
// check the MD5 from the patch file against the newly patched file
{
HashVal MD5_actual;
md5_a_file(_temp_file, MD5_actual);
if (memcmp((const void*)&_MD5_ofResult, (const void*)&MD5_actual, sizeof(HashVal))) {
// delete the temp file and the patch file
_temp_file.unlink();
_patch_file.unlink();
// return "invalid checksum"
return EU_error_invalid_checksum;
}
}
// delete the patch file and the original file
_patch_file.unlink();
_orig_file.unlink();
// rename the temp file
// rename the temp file to the original file name
if (!_temp_file.rename_to(_orig_file)) {
express_cat.error()
<< "Patchfile::run() failed to rename temp file to: " << _orig_file
@ -374,7 +389,7 @@ apply(Filename &patch_file, Filename &file) {
////////////////////////////////////////////////////////////////////
PN_uint16 Patchfile::
calc_hash(const char *buffer) {
#ifdef USE_MD5_HASH
#ifdef USE_MD5_FOR_HASHTABLE_INDEX_VALUES
HashVal hash;
md5_a_buffer((const unsigned char*)buffer, (int)_footprint_length, hash);
@ -386,7 +401,7 @@ calc_hash(const char *buffer) {
PN_uint16 hash_value = 0;
for(int i = 0; i < (int)_footprint_length; i++) {
// this is probably not such a good hash. to be replaced
// this is probably not such a good hash. to be replaced --> TRIED MD5, was not worth it for the execution-time hit on 800Mhz PC
hash_value ^= (*buffer) << (i % 8);
buffer++;
}
@ -641,6 +656,16 @@ build(Filename &file_orig, Filename &file_new) {
_datagram.clear();
_datagram.add_uint32(_magic_number);
_datagram.add_uint32(length_new);
{
// calc MD5 of resultant patched file
HashVal md5New;
md5_a_buffer((const unsigned char*)buffer_new, (int)length_new, md5New);
// add it to the header
_datagram.add_uint32(md5New.get_value(0));
_datagram.add_uint32(md5New.get_value(1));
_datagram.add_uint32(md5New.get_value(2));
_datagram.add_uint32(md5New.get_value(3));
}
string msg = _datagram.get_message();
write_stream.write((char *)msg.data(), msg.length());

5
panda/src/express/patchfile.h
View File

@ -1,5 +1,5 @@
// Filename: patchfile.h
// Created by: mike, darren (09Jan97)
// Created by: darren, mike (09Jan97)
//
////////////////////////////////////////////////////////////////////
//
@ -19,6 +19,7 @@
#include "datagramIterator.h"
#include "buffer.h"
#include "pointerTo.h"
#include "hashVal.h" // MD5 stuff
#include <algorithm>
@ -87,6 +88,8 @@ protected:
// async patch apply state variables
bool _initiated;
HashVal _MD5_ofResult;
PN_uint32 _result_file_length;
int _total_bytes_processed;