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

* Disabled Thread debugging.

Browse source 
* Fixed up bdProxyId initialisation
 * Improved Error Code translation (for unknown entries)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-01-20 17:30:16 +00:00
parent 6b2a6e771b
commit f08bcc153e
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libbitdht/src/bitdht/bdconnection.cc
View file

@ -34,6 +34,8 @@
#include "util/bdnet.h" #include "util/bdnet.h"
#include "util/bdrandom.h" #include "util/bdrandom.h"
#include <sstream>
/* /*
* #define DEBUG_PROXY_CONNECTION 1 * #define DEBUG_PROXY_CONNECTION 1
* #define DEBUG_NODE_CONNECTION 1 * #define DEBUG_NODE_CONNECTION 1
@ -3375,6 +3377,11 @@ std::string decodeConnectionErrorType(uint32_t errcode)
switch(errtype) switch(errtype)
{ {
default: default:
{
std::ostringstream out;
out << "(" << errtype << ")";
namedtype += out.str();
}
break; break;
case BITDHT_CONNECT_ERROR_GENERIC: case BITDHT_CONNECT_ERROR_GENERIC:
namedtype = "GENERIC"; namedtype = "GENERIC";
@ -3427,6 +3434,11 @@ std::string decodeConnectionErrorSource(uint32_t errcode)
switch(errsrc) switch(errsrc)
{ {
default: default:
{
std::ostringstream out;
out << "(" << errsrc << ")";
namedtype += out.str();
}
break; break;
case BITDHT_CONNECT_ERROR_SOURCE_START: case BITDHT_CONNECT_ERROR_SOURCE_START:
namedtype = "START"; namedtype = "START";

4
libbitdht/src/bitdht/bdconnection.h
View file

@ -153,8 +153,8 @@ class bdProxyId
{ {
public: public:
bdProxyId(const bdId &in_id, uint32_t in_srctype, uint32_t errcode) bdProxyId(const bdId &in_id, uint32_t in_srctype, uint32_t in_errcode)
:id(in_id), srcType(in_srctype) { return; } :id(in_id), srcType(in_srctype), errcode(in_errcode) { return; }
bdProxyId() :srcType(BD_PI_SRC_UNKNOWN) { return; } bdProxyId() :srcType(BD_PI_SRC_UNKNOWN) { return; }

2
libbitdht/src/util/bdthreads.cc
View file

@ -32,7 +32,7 @@
* #define DEBUG_THREADS 1 * #define DEBUG_THREADS 1
*******/ *******/
#define DEBUG_THREADS 1 //#define DEBUG_THREADS 1
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
#include <iostream> #include <iostream>