Skip to content

Temporary file when writing peers.dat obsolete #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 6, 2014
Merged

Temporary file when writing peers.dat obsolete #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1af1366
Revert 25a07f10 -- makefile.unix
deusstultus Dec 5, 2014
fd6c104
Merge pull request #56 from deusstultus/master
eduffield82 Dec 5, 2014
6eb44b0
Temporary file when writing peers.dat obsolete
crowning- Dec 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions src/db.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,21 +495,16 @@ bool CAddrDB::Write(const CAddrMan& addr)
{
unsigned char pchMessageStart[4] = { 0xfb, 0xc0, 0xb6, 0xdb };

// Generate random temporary filename
unsigned short randv = 0;
RAND_bytes((unsigned char *)&randv, sizeof(randv));
std::string tmpfn = strprintf("peers.dat.%04x", randv);

// serialize addresses, checksum data up to that point, then append csum
CDataStream ssPeers(SER_DISK, CLIENT_VERSION);
ssPeers << FLATDATA(pchMessageStart);
ssPeers << addr;
uint256 hash = Hash(ssPeers.begin(), ssPeers.end());
ssPeers << hash;

// open temp output file, and associate with CAutoFile
boost::filesystem::path pathTmp = GetDataDir() / tmpfn;
FILE *file = fopen(pathTmp.string().c_str(), "wb");
// open output file, and associate with CAutoFile
boost::filesystem::path pathAddr = GetDataDir() / "peers.dat";
FILE *file = fopen(pathAddr.string().c_str(), "wb");
CAutoFile fileout = CAutoFile(file, SER_DISK, CLIENT_VERSION);
if (!fileout)
return error("CAddrman::Write() : open failed");
Expand All @@ -524,10 +519,6 @@ bool CAddrDB::Write(const CAddrMan& addr)
FileCommit(fileout);
fileout.fclose();

// replace existing peers.dat, if any, with new peers.dat.XXXX
if (!RenameOver(pathTmp, pathAddr))
return error("CAddrman::Write() : Rename-into-place failed");

return true;
}

Expand Down
1 change: 0 additions & 1 deletion src/makefile.unix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ ifdef UNIT_TEST
DEFS+=-DUNIT_TEST=1
endif

STATIC = 1
LMODE = dynamic
LMODE2 = dynamic
ifdef STATIC
Expand Down