From 619b2416ac924d72b84566667f61bcd2ba5220ae Mon Sep 17 00:00:00 2001 From: drbob Date: Mon, 18 Jul 2011 08:37:11 +0000 Subject: [PATCH] disabled Relay connections, and enabled UDP connections. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4464 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/dht/p3bitdht.cc | 3 ++- libretroshare/src/pqi/p3linkmgr.cc | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/dht/p3bitdht.cc b/libretroshare/src/dht/p3bitdht.cc index 22bea7aef..dd1059d0d 100644 --- a/libretroshare/src/dht/p3bitdht.cc +++ b/libretroshare/src/dht/p3bitdht.cc @@ -126,7 +126,8 @@ p3BitDht::p3BitDht(std::string id, pqiConnectCb *cb, p3NetMgr *nm, /* enable all modes */ mUdpBitDht->ConnectionOptions( - BITDHT_CONNECT_MODE_DIRECT | BITDHT_CONNECT_MODE_PROXY | BITDHT_CONNECT_MODE_RELAY, + // BITDHT_CONNECT_MODE_DIRECT | BITDHT_CONNECT_MODE_PROXY | BITDHT_CONNECT_MODE_RELAY, + BITDHT_CONNECT_MODE_DIRECT | BITDHT_CONNECT_MODE_PROXY, BITDHT_CONNECT_OPTION_AUTOPROXY); } diff --git a/libretroshare/src/pqi/p3linkmgr.cc b/libretroshare/src/pqi/p3linkmgr.cc index e6c46b2d9..6f7701c65 100644 --- a/libretroshare/src/pqi/p3linkmgr.cc +++ b/libretroshare/src/pqi/p3linkmgr.cc @@ -56,6 +56,9 @@ const int p3connectzone = 3431; * #define LINKMGR_DEBUG_ACTIONS 1 ***/ +/**** + * #define DISABLE_UDP_CONNECTIONS 1 + ***/ /**** * #define P3CONNMGR_NO_TCP_CONNECTIONS 1 @@ -1283,7 +1286,6 @@ bool p3LinkMgrIMPL::tryConnectUDP(const std::string &id, struct sockaddr_in &r { -#define DISABLE_UDP_CONNECTIONS 1 #ifdef DISABLE_UDP_CONNECTIONS std::cerr << "p3LinkMgrIMPL::tryConnectUDP() CONNECTIONS DISABLED FOR NOW... id: " << id << std::endl;