* Enabled Relays by default.

- This will only effect people who upgrade from a very old version.
 	- Other people will have to switch it on manually.
	- Default is 0 friends, 1 FOF & 1 General @ 1kb/s... max 4kb/s usage per peer.
 * Switched off lots of debugging.
 * Bugfix for natassist (zeroconf returns 0.0.0.0:0 when its doesn't work).
 * Logged IP Addresses for Failed incoming connections.
 * Hacked IP address into the NewsFeed notifications (ugly).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-01-20 17:50:19 +00:00
parent f08bcc153e
commit 87944f251e
11 changed files with 69 additions and 25 deletions

View file

@ -31,7 +31,7 @@
#include <sstream>
#include <iostream>
#define DEBUG_ZCNATASSIST 1
//#define DEBUG_ZCNATASSIST 1
p3zcNatAssist::p3zcNatAssist()
@ -386,6 +386,17 @@ void p3zcNatAssist::callbackMapping(DNSServiceRef sdRef, DNSServiceFlags flags,
return;
}
if ((externalAddress == 0) && (externalPort == 0))
{
/* failed :( */
mMapped = false;
std::cerr << "p3zcNatAssist::callbackMapping() ZeroAddress ... Mapping not possible";
std::cerr << std::endl;
return;
}
mMapped = true;
mExternalAddress.sin_addr.s_addr = externalAddress;
mExternalAddress.sin_port = externalPort;

View file

@ -41,7 +41,7 @@
*
*/
#define DEBUG_ZEROCONF 1
//#define DEBUG_ZEROCONF 1
#define ZC_MAX_QUERY_TIME 30
#define ZC_MAX_RESOLVE_TIME 30