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

removed some debug messages, added some ifdefs

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-12-21 19:12:40 +00:00
parent a895261bd5
commit acc45a4382
8 changed files with 177 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -461,7 +461,6 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
uint32_t mode, uint32_t point, uint32_t param, uint32_t cbtype, uint32_t errcode)
{
#ifdef DEBUG_PEERNET
#endif
std::cerr << "p3BitDht::ConnectCallback()";
std::cerr << std::endl;
std::cerr << "srcId: ";
@ -479,6 +478,7 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
std::cerr << " point: " << point;
std::cerr << " cbtype: " << cbtype;
std::cerr << std::endl;
#endif
/* we handle MID and START/END points differently... this is biggest difference.
@ -898,7 +898,6 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
case BITDHT_CONNECT_CB_FAILED:
{
#ifdef DEBUG_PEERNET
#endif
std::cerr << "dhtConnectionCallback() Connection Attempt Failed with:";
bdStdPrintId(std::cerr, &(peerId));
std::cerr << std::endl;
@ -915,6 +914,7 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
std::cerr << " ErrorSrc: " << errsrc;
std::cerr << " ErrorType: " << errtype;
std::cerr << std::endl;
#endif
RsStackMutex stack(dhtMtx); /********** LOCKED MUTEX ***************/
@ -1873,7 +1873,6 @@ void p3BitDht::initiateConnection(const bdId *srcId, const bdId *proxyId, const
uint32_t mode, uint32_t loc, uint32_t delayOrBandwidth)
{
#ifdef DEBUG_PEERNET
#endif
std::cerr << "p3BitDht::initiateConnection()";
std::cerr << std::endl;
std::cerr << "\t srcId: ";
@ -1892,6 +1891,7 @@ void p3BitDht::initiateConnection(const bdId *srcId, const bdId *proxyId, const
std::cerr << std::endl;
std::cerr << "\t DelayOrBandwidth: " << delayOrBandwidth;
std::cerr << std::endl;
#endif
bdId peerConnectId;
@ -2376,10 +2376,10 @@ void p3BitDht::UdpConnectionFailed_locked(DhtPeerDetails *dpd)
void p3BitDht::ReleaseProxyExclusiveMode_locked(DhtPeerDetails *dpd, bool addrChgLikely)
{
#ifdef DEBUG_BITDHT_COMMON
#endif
std::cerr << "p3BitDht::ReleaseProxyExclusiveMode_locked()";
bdStdPrintNodeId(std::cerr, &(dpd->mDhtId.id));
std::cerr << std::endl;
#endif
/* translate id into string for exclusive mode */
std::string pid;
@ -2393,10 +2393,10 @@ void p3BitDht::ReleaseProxyExclusiveMode_locked(DhtPeerDetails *dpd, bool addrCh
dpd->mExclusiveProxyLock = false;
#ifdef DEBUG_PEERNET
#endif
std::cerr << "p3BitDht::ReleaseProxyExclusiveMode_locked() Lock released by Connection to peer: ";
bdStdPrintNodeId(std::cerr, &(dpd->mDhtId.id));
std::cerr << std::endl;
#endif
}
else
{
@ -2411,9 +2411,9 @@ void p3BitDht::ReleaseProxyExclusiveMode_locked(DhtPeerDetails *dpd, bool addrCh
else
{
#ifdef DEBUG_BITDHT_COMMON
#endif
std::cerr << "p3BitDht::ReleaseProxyExclusiveMode_locked() Don't Have a Lock";
std::cerr << std::endl;
#endif
}
}

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

@ -222,7 +222,7 @@ int p3BitDht::addKnownPeer(const RsPeerId &pid, const struct sockaddr_storage &a
if (addr.ss_family != AF_INET)
{
std::cerr << "p3BitDht::addKnownPeer() Warning! Non IPv4 Address - Cannot handle IPV6 Yet.";
std::cerr << "p3BitDht::addKnownPeer() Warning! Non IPv4 Address - Cannot handle IPV6 Yet. addr.ss_family=" << addr.ss_family;
std::cerr << std::endl;
sockaddr_clear(&addrv4);