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

removed some debug output

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-01-20 21:13:17 +00:00
parent f3af40337f
commit 158249d66e
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libbitdht/src/bitdht/bdnode.cc
View file

@ -750,10 +750,12 @@ void bdNode::processRemoteQuery()
{ {
std::cerr << "bdNode::processRemoteQuery() Query from BadPeer: Discarding: "; std::cerr << "bdNode::processRemoteQuery() Query from BadPeer: Discarding: ";
} }
#ifdef DEBUG_NODE_MSGS
else else
{ {
std::cerr << "bdNode::processRemoteQuery() Query Too Old: Discarding: "; std::cerr << "bdNode::processRemoteQuery() Query Too Old: Discarding: ";
} }
#endif
mFns->bdPrintId(std::cerr, &(query.mId)); mFns->bdPrintId(std::cerr, &(query.mId));
std::cerr << std::endl; std::cerr << std::endl;
#ifdef DEBUG_NODE_MSGS #ifdef DEBUG_NODE_MSGS
@ -819,11 +821,13 @@ void bdNode::incomingMsg(struct sockaddr_in *addr, char *msg, int len)
bdNodeNetMsg *bdmsg = new bdNodeNetMsg(msg, len, addr); bdNodeNetMsg *bdmsg = new bdNodeNetMsg(msg, len, addr);
mIncomingMsgs.push_back(bdmsg); mIncomingMsgs.push_back(bdmsg);
} }
#ifdef DEBUG_NODE_MSGOUT
else else
{ {
std::cerr << "bdNode::incomingMsg() Incoming Packet Filtered"; std::cerr << "bdNode::incomingMsg() Incoming Packet Filtered";
std::cerr << std::endl; std::cerr << std::endl;
} }
#endif
} }
/************************************ Message Handling *****************************/ /************************************ Message Handling *****************************/
@ -1636,11 +1640,11 @@ void bdNode::recvPkt(char *msg, int len, struct sockaddr_in addr)
} }
case BITDHT_MSG_TYPE_CONNECT: /* a: id, src, dest, mode, status, type */ case BITDHT_MSG_TYPE_CONNECT: /* a: id, src, dest, mode, status, type */
{ {
//#ifdef DEBUG_NODE_MSGS #ifdef DEBUG_NODE_MSGS
std::cerr << "bdNode::recvPkt() ConnectMsg from: "; std::cerr << "bdNode::recvPkt() ConnectMsg from: ";
mFns->bdPrintId(std::cerr, &srcId); mFns->bdPrintId(std::cerr, &srcId);
std::cerr << std::endl; std::cerr << std::endl;
//#endif #endif
msgin_connect_genmsg(&srcId, &transId, connType, msgin_connect_genmsg(&srcId, &transId, connType,
&connSrcAddr, &connDestAddr, &connSrcAddr, &connDestAddr,
connMode, connParam, connStatus); connMode, connParam, connStatus);
@ -2042,6 +2046,7 @@ std::string getConnectMsgType(int msgtype)
void bdNode::msgout_connect_genmsg(bdId *id, bdToken *transId, int msgtype, bdId *srcAddr, bdId *destAddr, int mode, int param, int status) void bdNode::msgout_connect_genmsg(bdId *id, bdToken *transId, int msgtype, bdId *srcAddr, bdId *destAddr, int mode, int param, int status)
{ {
#ifdef DEBUG_NODE_MSGOUT
std::cerr << "bdConnectManager::msgout_connect_genmsg() Type: " << getConnectMsgType(msgtype); std::cerr << "bdConnectManager::msgout_connect_genmsg() Type: " << getConnectMsgType(msgtype);
std::cerr << " TransId: "; std::cerr << " TransId: ";
bdPrintTransId(std::cerr, transId); bdPrintTransId(std::cerr, transId);
@ -2055,7 +2060,6 @@ void bdNode::msgout_connect_genmsg(bdId *id, bdToken *transId, int msgtype, bdId
std::cerr << " Param: " << param; std::cerr << " Param: " << param;
std::cerr << " Status: " << status; std::cerr << " Status: " << status;
std::cerr << std::endl; std::cerr << std::endl;
#ifdef DEBUG_NODE_MSGOUT
#endif #endif
switch(msgtype) switch(msgtype)
@ -2091,6 +2095,7 @@ void bdNode::msgin_connect_genmsg(bdId *id, bdToken *transId, int msgtype,
{ {
std::list<bdId>::iterator it; std::list<bdId>::iterator it;
#ifdef DEBUG_NODE_MSGS
std::cerr << "bdConnectManager::msgin_connect_genmsg() Type: " << getConnectMsgType(msgtype); std::cerr << "bdConnectManager::msgin_connect_genmsg() Type: " << getConnectMsgType(msgtype);
std::cerr << " TransId: "; std::cerr << " TransId: ";
bdPrintTransId(std::cerr, transId); bdPrintTransId(std::cerr, transId);
@ -2104,7 +2109,6 @@ void bdNode::msgin_connect_genmsg(bdId *id, bdToken *transId, int msgtype,
std::cerr << " Param: " << param; std::cerr << " Param: " << param;
std::cerr << " Status: " << status; std::cerr << " Status: " << status;
std::cerr << std::endl; std::cerr << std::endl;
#ifdef DEBUG_NODE_MSGS
#else #else
(void) transId; (void) transId;
#endif #endif
@ -2370,8 +2374,10 @@ void bdNode::dropRelayServers()
void bdNode::pingRelayServers() void bdNode::pingRelayServers()
{ {
/* if Relay's have been switched on, do search/ping to locate servers */ /* if Relay's have been switched on, do search/ping to locate servers */
#ifdef DEBUG_NODE_MSGS
std::cerr << "bdNode::pingRelayServers()"; std::cerr << "bdNode::pingRelayServers()";
std::cerr << std::endl; std::cerr << std::endl;
#endif
bool doSearch = true; bool doSearch = true;
@ -2387,9 +2393,11 @@ void bdNode::pingRelayServers()
uint32_t qflags = BITDHT_QFLAGS_INTERNAL | BITDHT_QFLAGS_DISGUISE; uint32_t qflags = BITDHT_QFLAGS_INTERNAL | BITDHT_QFLAGS_DISGUISE;
mQueryMgr->addQuery(&(*it), qflags); mQueryMgr->addQuery(&(*it), qflags);
#ifdef DEBUG_NODE_MSGS
std::cerr << "bdNode::pingRelayServers() Adding Internal Search for Relay Server: "; std::cerr << "bdNode::pingRelayServers() Adding Internal Search for Relay Server: ";
mFns->bdPrintNodeId(std::cerr, &(*it)); mFns->bdPrintNodeId(std::cerr, &(*it));
std::cerr << std::endl; std::cerr << std::endl;
#endif
} }
else else

4
libretroshare/src/turtle/p3turtle.cc
View file

@ -505,9 +505,9 @@ void p3turtle::autoWash()
for(uint32_t i=0;i<services_vpids_to_remove.size();++i) for(uint32_t i=0;i<services_vpids_to_remove.size();++i)
{ {
//#ifdef P3TURTLE_DEBUG #ifdef P3TURTLE_DEBUG
std::cerr << " removing virtual peer id " << services_vpids_to_remove[i].second.second << " for service " << services_vpids_to_remove[i].first <<", for hash " << services_vpids_to_remove[i].second.first << std::endl ; std::cerr << " removing virtual peer id " << services_vpids_to_remove[i].second.second << " for service " << services_vpids_to_remove[i].first <<", for hash " << services_vpids_to_remove[i].second.first << std::endl ;
//#endif #endif
services_vpids_to_remove[i].first->removeVirtualPeer(services_vpids_to_remove[i].second.first,services_vpids_to_remove[i].second.second) ; services_vpids_to_remove[i].first->removeVirtualPeer(services_vpids_to_remove[i].second.first,services_vpids_to_remove[i].second.second) ;
} }
} }