More changes for debugging

* Enabled lots of debugging.
 * Switched to shorter timeouts for udprelays.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4763 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libbitdht/src/bitdht/bdconnection.cc

@@ -40,6 +40,7 @@
  * #define DEBUG_CONNECTION_DELAY		1
  */
 
+#define DEBUG_NODE_CONNECTION		1 
 #define DEBUG_CONNECTION_DELAY		1
 
 

libbitdht/src/bitdht/bdmanager.cc

@@ -58,7 +58,7 @@
  * #define DEBUG_MGR_PKT 1
  ***/
 
-#define DEBUG_MGR 1
+//#define DEBUG_MGR 1
 
 //#define LOCAL_NET_FLAG		(BITDHT_PEER_STATUS_DHT_APPL)
 #define LOCAL_NET_FLAG		(BITDHT_PEER_STATUS_DHT_ENGINE)

libretroshare/src/dht/connectstatebox.cc

@@ -38,6 +38,9 @@
  *
  **/
 
+#define TESTING_PERIODS		1
+#define DEBUG_CONNECTBOX	1
+
 /* Have made the PROXY Attempts + MAX_TIME much larger, 
  * have have potential for this to take a while.
  */
@@ -46,18 +49,18 @@
 	#define FAILED_WAIT_TIME	(1800)  // 5 minutes.
 	#define TCP_WAIT_TIME		(10)   // 1/6 minutes.
 	#define DIRECT_MAX_WAIT_TIME	(30)   // 1/6 minutes.
-	#define PROXY_BASE_WAIT_TIME	(30)   // 1/6 minutes.
+	#define PROXY_BASE_WAIT_TIME	(10)   // 30 // 1/6 minutes.
-	#define PROXY_MAX_WAIT_TIME	(120)   // 1/6 minutes.
+	#define PROXY_MAX_WAIT_TIME	(30)  // 120 // 1/6 minutes.
 	#define RELAY_MAX_WAIT_TIME	(30)   // 1/6 minutes.
 	#define REVERSE_WAIT_TIME	(30)   // 1/2 minutes.
 
 	#define MAX_DIRECT_ATTEMPTS	(3)
-	#define MAX_PROXY_ATTEMPTS	(10)
+	#define MAX_PROXY_ATTEMPTS	(3)
 	#define MAX_RELAY_ATTEMPTS	(3)
 
 	#define MAX_DIRECT_FAILED_ATTEMPTS	(1)
 	#define MAX_PROXY_FAILED_ATTEMPTS	(2)
-	#define MAX_RELAY_FAILED_ATTEMPTS	(1)
+	#define MAX_RELAY_FAILED_ATTEMPTS	(2)
 #else
 	#define FAILED_WAIT_TIME	(1800) // 30 minutes.
 	#define TCP_WAIT_TIME		(60)   // 1 minutes.

libretroshare/src/dht/p3bitdht_peernet.cc

@@ -31,6 +31,8 @@
  *
  **/
 
+#define DEBUG_PEERNET	1 
+
 
 
 /******************************************************************************************

libretroshare/src/tcponudp/udprelay.cc

@@ -30,7 +30,7 @@
  * #define DEBUG_UDP_RELAY 1
  */
 
-//#define DEBUG_UDP_RELAY 1
+#define DEBUG_UDP_RELAY 1
 
 
 #ifdef DEBUG_UDP_RELAY
@@ -86,11 +86,14 @@ int     UdpRelayReceiver::addUdpPeer(UdpPeer *peer, UdpRelayAddrSet *endPoints,
 		if (!ok)
 		{
 #ifdef DEBUG_UDP_RELAY
-			std::cerr << "UdpPeerReceiver::addUdpPeer() ERROR Peer already exists!" << std::endl;
+			std::cerr << "UdpRelayReceiver::addUdpPeer() ERROR Peer already exists!" << std::endl;
 #endif
 			return 0;
 		}
 		
+#ifdef DEBUG_UDP_RELAY
+		std::cerr << "UdpRelayReceiver::addUdpPeer() Installing UdpRelayEnd (mapping)" << std::endl;
+#endif
 		/* setup a peer */
 		UdpRelayEnd ure(endPoints, proxyaddr);
 		
@@ -102,7 +105,7 @@ int     UdpRelayReceiver::addUdpPeer(UdpPeer *peer, UdpRelayAddrSet *endPoints,
 		
 
 #ifdef DEBUG_UDP_RELAY
-		std::cerr << "UdpPeerReceiver::addUdpPeer() Just installing UdpPeer!" << std::endl;
+		std::cerr << "UdpRelayReceiver::addUdpPeer() Installing UdpPeer" << std::endl;
 #endif
 		
 		/* just overwrite */
@@ -131,6 +134,9 @@ int     UdpRelayReceiver::removeUdpPeer(UdpPeer *peer)
 				found = true;
 				realPeerAddr = it->first;
 
+#ifdef DEBUG_UDP_RELAY
+				std::cerr << "UdpRelayReceiver::removeUdpPeer() removing UdpPeer" << std::endl;
+#endif
 				break;
 			}
 		}
@@ -138,6 +144,9 @@ int     UdpRelayReceiver::removeUdpPeer(UdpPeer *peer)
 
 	if (!found)
 	{
+#ifdef DEBUG_UDP_RELAY
+		std::cerr << "UdpRelayReceiver::removeUdpPeer() Warning: Failed to find UdpPeer" << std::endl;
+#endif
 		return 0;
 	}
 
@@ -154,6 +163,9 @@ int     UdpRelayReceiver::removeUdpPeer(UdpPeer *peer)
 		else
 		{
 			/* ERROR */	
+#ifdef DEBUG_UDP_RELAY
+			std::cerr << "UdpRelayReceiver::removeUdpPeer() ERROR failed to find Mapping" << std::endl;
+#endif
 		}
 	}
 	return 1;
@@ -197,8 +209,10 @@ int UdpRelayReceiver::checkRelays()
 
 	/* iterate through the Relays */
 
+#ifdef DEBUG_UDP_RELAY
 	std::cerr << "UdpRelayReceiver::checkRelays()";
 	std::cerr << std::endl;
+#endif
 
 	std::list<UdpRelayAddrSet> eraseList;
 	std::map<UdpRelayAddrSet, UdpRelayProxy>::iterator rit;
@@ -211,28 +225,34 @@ int UdpRelayReceiver::checkRelays()
 		rit->second.mDataSize = 0;
 		rit->second.mLastBandwidthTS = now;
 
+#ifdef DEBUG_UDP_RELAY
 		std::cerr << "UdpRelayReceiver::checkRelays()";
 		std::cerr << "Relay: " << rit->first;
 		std::cerr << " using bandwidth: " << rit->second.mBandwidth;
 		std::cerr << std::endl;
+#endif
 
 		if (rit->second.mBandwidth > rit->second.mBandwidthLimit)
 		{
+#ifdef DEBUG_UDP_RELAY
 			std::cerr << "UdpRelayReceiver::checkRelays() ";
 			std::cerr << "Dropping Relay due to excessive Bandwidth: " << rit->second.mBandwidth;
 			std::cerr << " Exceeding Limit: " << rit->second.mBandwidthLimit;
 			std::cerr << " Relay: " << rit->first;
 			std::cerr << std::endl;
+#endif
 
 			/* if exceeding bandwidth -> drop */
 			eraseList.push_back(rit->first);
 		}
 		else if (now - rit->second.mLastTS > RELAY_TIMEOUT)
 		{
+#ifdef DEBUG_UDP_RELAY
 			/* if haven't transmitted for ages -> drop */
 			std::cerr << "UdpRelayReceiver::checkRelays() ";
 			std::cerr << "Dropping Relay due to Timeout: " << rit->first;
 			std::cerr << std::endl;
+#endif
 			eraseList.push_back(rit->first);
 		}
 		else
@@ -254,11 +274,13 @@ int UdpRelayReceiver::checkRelays()
 			}
 			if (now - rit->second.mStartTS > lifetime)
 			{
+#ifdef DEBUG_UDP_RELAY
 				std::cerr << "UdpRelayReceiver::checkRelays() ";
 				std::cerr << "Dropping Relay due to Passing Lifetime Limit: " << lifetime;
 				std::cerr << " for class: " << rit->second.mRelayClass;
 				std::cerr << " Relay: " << rit->first;
 				std::cerr << std::endl;
+#endif
 
 				eraseList.push_back(rit->first);
 			}