From 0cff6414a01fce201ece174cab122dbdba48c679 Mon Sep 17 00:00:00 2001
From: drbob <contact@retroshare.cc>
Date: Tue, 5 Jul 2011 23:53:40 +0000
Subject: [PATCH]  * added #define WIN32 protection for <malloc> in bdbloom  *
 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
---
 src/bitdht/bdmanager.cc | 11 ++++++-----
 src/bitdht/bdnode.cc    |  3 ++-
 src/util/bdbloom.cc     |  4 +++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/bitdht/bdmanager.cc b/src/bitdht/bdmanager.cc
index 439b6f7..f4a6637 100644
--- a/src/bitdht/bdmanager.cc
+++ b/src/bitdht/bdmanager.cc
@@ -272,11 +272,12 @@ void bdNodeManager::iteration()
 			 * 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 MAX_FINDSELF_TIME		60
-//#define MIN_OP_SPACE_SIZE		20 
-#define MAX_FINDSELF_TIME		10
-#define MIN_OP_SPACE_SIZE		2   // for testing. self + oneother.
+#define TRANSITION_OP_SPACE_SIZE	50 /* 1 query / sec, should take 12-15 secs */
+#define MAX_FINDSELF_TIME		30
+#define MIN_OP_SPACE_SIZE		10
+// testing parameters.
+//#define MAX_FINDSELF_TIME		10
+//#define MIN_OP_SPACE_SIZE		2   // for testing. self + oneother.
 
 			{
 				uint32_t nodeSpaceSize = mNodeSpace.calcSpaceSize();
diff --git a/src/bitdht/bdnode.cc b/src/bitdht/bdnode.cc
index d506fb7..17b5fce 100644
--- a/src/bitdht/bdnode.cc
+++ b/src/bitdht/bdnode.cc
@@ -79,7 +79,8 @@ void bdNode::init()
  	std::list<bdFilteredPeer> emptyList;
 	mFilterPeers = new bdFilter(&mOwnId, emptyList, BITDHT_FILTER_REASON_OWNID, mFns);
 	
-	setNodeOptions(BITDHT_OPTIONS_MAINTAIN_UNSTABLE_PORT);
+	//setNodeOptions(BITDHT_OPTIONS_MAINTAIN_UNSTABLE_PORT);
+	setNodeOptions(0);
 
 }
 
diff --git a/src/util/bdbloom.cc b/src/util/bdbloom.cc
index e6dbe3a..2772e93 100644
--- a/src/util/bdbloom.cc
+++ b/src/util/bdbloom.cc
@@ -27,8 +27,10 @@
 
 #include <sstream>
 #include <iomanip>
-#include <malloc.h>
 
+#if defined(_WIN32) || defined(__MINGW32__)
+	#include <malloc.h>
+#endif
 /* Bloom Filter implementation */