Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* added #define WIN32 protection for <malloc> in bdbloom

Browse Source 
* disabled ATTACHED mode by default.
 * set reasonable default Startup parameters (had test ones before)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-07-05 23:53:40 +00:00
parent cca2962116
commit 24351cb460
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libbitdht/src/bitdht/bdmanager.cc
View File

@ -272,11 +272,12 @@ void bdNodeManager::iteration()
* if, after 60 secs, we haven't reached MIN_OP_SPACE_SIZE, restart.... * if, after 60 secs, we haven't reached MIN_OP_SPACE_SIZE, restart....
*/ */
#define TRANSITION_OP_SPACE_SIZE 100 /* 1 query / sec, should take 12-15 secs */ #define TRANSITION_OP_SPACE_SIZE 50 /* 1 query / sec, should take 12-15 secs */
//#define MAX_FINDSELF_TIME 60 #define MAX_FINDSELF_TIME 30
//#define MIN_OP_SPACE_SIZE 20 #define MIN_OP_SPACE_SIZE 10
#define MAX_FINDSELF_TIME 10 // testing parameters.
#define MIN_OP_SPACE_SIZE 2 // for testing. self + oneother. //#define MAX_FINDSELF_TIME 10
//#define MIN_OP_SPACE_SIZE 2 // for testing. self + oneother.
{ {
uint32_t nodeSpaceSize = mNodeSpace.calcSpaceSize(); uint32_t nodeSpaceSize = mNodeSpace.calcSpaceSize();

3
libbitdht/src/bitdht/bdnode.cc
View File

@ -79,7 +79,8 @@ void bdNode::init()
std::list<bdFilteredPeer> emptyList; std::list<bdFilteredPeer> emptyList;
mFilterPeers = new bdFilter(&mOwnId, emptyList, BITDHT_FILTER_REASON_OWNID, mFns); mFilterPeers = new bdFilter(&mOwnId, emptyList, BITDHT_FILTER_REASON_OWNID, mFns);
setNodeOptions(BITDHT_OPTIONS_MAINTAIN_UNSTABLE_PORT); //setNodeOptions(BITDHT_OPTIONS_MAINTAIN_UNSTABLE_PORT);
setNodeOptions(0);
} }

4
libbitdht/src/util/bdbloom.cc
View File

@ -27,8 +27,10 @@
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <malloc.h>
#if defined(_WIN32) || defined(__MINGW32__)
#include <malloc.h>
#endif
/* Bloom Filter implementation */ /* Bloom Filter implementation */