Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 15:39:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

disabled debug print of DHT requests, disabled debug print in p3Peers::getProxyServer(), added missing newlines in debug prints (modified patch from Hypfer)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-03-27 18:41:44 +00:00
parent c252195d8d
commit d65adeb2ea
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbitdht/src/bitdht/bdnode.cc
View File

@ -766,9 +766,9 @@ void bdNode::processRemoteQuery()
std::cerr << "bdNode::processRemoteQuery() Query Too Old: Discarding: "; std::cerr << "bdNode::processRemoteQuery() Query Too Old: Discarding: ";
} }
#endif #endif
#ifdef DEBUG_NODE_MSGS
mFns->bdPrintId(std::cerr, &(query.mId)); mFns->bdPrintId(std::cerr, &(query.mId));
std::cerr << std::endl; std::cerr << std::endl;
#ifdef DEBUG_NODE_MSGS
#endif #endif
} }

2
libretroshare/src/pqi/pqiservice.cc
View File

@ -105,7 +105,7 @@ bool p3ServiceServer::recvItem(RsRawItem *item)
// This doesn't need to be in Mutex. // This doesn't need to be in Mutex.
if (!mServiceControl->checkFilter(item->PacketId() & 0xffffff00, item->PeerId())) if (!mServiceControl->checkFilter(item->PacketId() & 0xffffff00, item->PeerId()))
{ {
std::cerr << "p3ServiceServer::recvItem() Fails Filtering"; std::cerr << "p3ServiceServer::recvItem() Fails Filtering " << std::endl;
delete item; delete item;
return false; return false;
} }

6
libretroshare/src/rsserver/p3peers.cc
View File

@ -919,7 +919,9 @@ bool p3Peers::setVisState(const RsPeerId &id, uint16_t vs_disc, uint16_t vs_dht)
bool p3Peers::getProxyServer(std::string &addr, uint16_t &port, uint32_t &status) bool p3Peers::getProxyServer(std::string &addr, uint16_t &port, uint32_t &status)
{ {
#ifdef P3PEERS_DEBUG
std::cerr << "p3Peers::getProxyServer()" << std::endl; std::cerr << "p3Peers::getProxyServer()" << std::endl;
#endif
struct sockaddr_storage proxy_addr; struct sockaddr_storage proxy_addr;
mPeerMgr->getProxyServerAddress(proxy_addr); mPeerMgr->getProxyServerAddress(proxy_addr);
@ -931,9 +933,9 @@ bool p3Peers::getProxyServer(std::string &addr, uint16_t &port, uint32_t &status
bool p3Peers::setProxyServer(const std::string &addr_str, const uint16_t port) bool p3Peers::setProxyServer(const std::string &addr_str, const uint16_t port)
{ {
#ifdef P3PEERS_DEBUG #ifdef P3PEERS_DEBUG
#endif
std::cerr << "p3Peers::setProxyServer() " << std::endl; std::cerr << "p3Peers::setProxyServer() " << std::endl;
#endif
struct sockaddr_storage addr; struct sockaddr_storage addr;
struct sockaddr_in *addrv4p = (struct sockaddr_in *) &addr; struct sockaddr_in *addrv4p = (struct sockaddr_in *) &addr;

6
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -802,7 +802,7 @@ bool RsHtml::makeEmbeddedImage(const QString &fileName, QString &embeddedImage,
QImage image; QImage image;
if (image.load (fileName) == false) { if (image.load (fileName) == false) {
fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load", fileName.toLatin1().constData()); fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load\n", fileName.toLatin1().constData());
return false; return false;
} }
return RsHtml::makeEmbeddedImage(image, embeddedImage, maxPixels); return RsHtml::makeEmbeddedImage(image, embeddedImage, maxPixels);
@ -845,11 +845,11 @@ bool RsHtml::makeEmbeddedImage(const QImage &originalImage, QString &embeddedIma
embeddedImage.append(encodedByteArray); embeddedImage.append(encodedByteArray);
embeddedImage.append("\">"); embeddedImage.append("\">");
} else { } else {
fprintf (stderr, "RsHtml::makeEmbeddedImage() - image can't be saved to buffer"); fprintf (stderr, "RsHtml::makeEmbeddedImage() - image can't be saved to buffer\n");
return false; return false;
} }
} else { } else {
fprintf (stderr, "RsHtml::makeEmbeddedImage() - buffer can't be opened"); fprintf (stderr, "RsHtml::makeEmbeddedImage() - buffer can't be opened\n");
return false; return false;
} }
return true; return true;