Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 06:06:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reversed Changes for Testing Purposes.

Browse source 
* Disabled lots of debugging.
 * Disabled LOCAL test mode in udpstunner, rsinit
 * Enabled BadPeer checking in bitdht.
 * Restored normal timeout periods for connection attempts.
 * Restored normal connection levels for dht status.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-01-11 10:24:37 +00:00
parent e0dcca8d13
commit 9e5e07d3f0
8 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/dht/connectstatebox.cc
View file

@ -38,8 +38,6 @@
*
**/
#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.

3
libretroshare/src/dht/p3bitdht_peernet.cc
View file

@ -31,9 +31,6 @@
*
**/
#define DEBUG_PEERNET 1
/******************************************************************************************
************************************* Dht Callback ***************************************

10
libretroshare/src/rsserver/rsinit.cc
View file

@ -315,9 +315,11 @@ void RsInit::InitRsConfig()
/********
* LOCALNET_TESTING - allows port restrictions
*
* #define LOCALNET_TESTING 1
*
********/
#define LOCALNET_TESTING 1
#ifdef LOCALNET_TESTING
@ -2027,10 +2029,14 @@ int RsServer::StartupRetroShare()
struct sockaddr_in sndladdr;
sockaddr_clear(&sndladdr);
//uint16_t rndport = MIN_RANDOM_PORT + RSRandom::random_u32() % (MAX_RANDOM_PORT - MIN_RANDOM_PORT);
#ifdef LOCALNET_TESTING
// HACK Proxy Port near Dht Port - For Relay Testing.
uint16_t rndport = RsInitConfig::port + 3;
sndladdr.sin_port = htons(rndport);
#else
uint16_t rndport = MIN_RANDOM_PORT + RSRandom::random_u32() % (MAX_RANDOM_PORT - MIN_RANDOM_PORT);
#endif
#ifdef LOCALNET_TESTING

2
libretroshare/src/tcponudp/udprelay.cc
View file

@ -31,7 +31,7 @@
* #define DEBUG_UDP_RELAY_PKTS 1
*/
#define DEBUG_UDP_RELAY 1
//#define DEBUG_UDP_RELAY 1
#ifdef DEBUG_UDP_RELAY

2
libretroshare/src/tcponudp/udpstunner.h
View file

@ -72,8 +72,6 @@ class TouStunPeer
* #define UDPSTUN_ALLOW_LOCALNET 1
*/
#define UDPSTUN_ALLOW_LOCALNET 1
class UdpStunner: public UdpSubReceiver
{
public: