Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

update log of p3tunnel

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-02-25 22:43:20 +00:00
parent be5957742c
commit 57e2e94f8f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/services/p3tunnel.cc
View File

@ -29,6 +29,7 @@
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "services/p3tunnel.h" #include "services/p3tunnel.h"
#include "pqi/pqissltunnel.h" #include "pqi/pqissltunnel.h"
#include <sstream>
#include "pqi/authssl.h" #include "pqi/authssl.h"
#include "pqi/p3connmgr.h" #include "pqi/p3connmgr.h"
@ -74,8 +75,7 @@ int p3tunnel::handleIncoming()
RsItem *item = NULL; RsItem *item = NULL;
#ifdef P3TUNNEL_DEBUG #ifdef P3TUNNEL_DEBUG
std::cerr << "p3tunnel::handleIncoming() called"; //std::cerr << "p3tunnel::handleIncoming() called." << std::endl;
std::cerr << std::endl;
#endif #endif
int nhandled = 0; int nhandled = 0;
@ -95,9 +95,9 @@ int p3tunnel::handleIncoming()
#endif #endif
} }
if (NULL != (tdi = dynamic_cast<RsTunnelDataItem *> (item))) { if (NULL != (tdi = dynamic_cast<RsTunnelDataItem *> (item))) {
#ifdef P3TUNNEL_DEBUG #ifdef P3TUNNEL_DEBUG
std::cerr << "p3tunnel::handleIncoming() getRsItemSize(tdi->encoded_data) : " << getRsItemSize(tdi->encoded_data) << std::endl; std::cerr << "p3tunnel::handleIncoming() tdi->encoded_data_len : " << tdi->encoded_data_len << std::endl;
#endif #endif
recvTunnelData(tdi); recvTunnelData(tdi);
nhandled++; nhandled++;
@ -146,7 +146,7 @@ void p3tunnel::sendTunnelDataPrivate(int accept, std::string to, std::string sou
memcpy(rdi->encoded_data, data, data_length); memcpy(rdi->encoded_data, data, data_length);
#ifdef P3TUNNEL_DEBUG #ifdef P3TUNNEL_DEBUG
std::cerr << "p3tunnel::sendTunnelDataPrivate() getRsItemSize(rdi->encoded_data) : "<< getRsItemSize(rdi->encoded_data) << std::endl; std::cerr << "p3tunnel::sendTunnelDataPrivate() data_length : "<< data_length << std::endl;
#endif #endif
rdi->PeerId(to); rdi->PeerId(to);
@ -156,9 +156,11 @@ void p3tunnel::sendTunnelDataPrivate(int accept, std::string to, std::string sou
} }
void p3tunnel::pingTunnelConnection(std::string relayPeerId, std::string destPeerId) { void p3tunnel::pingTunnelConnection(std::string relayPeerId, std::string destPeerId) {
#ifdef P3TUNNEL_DEBUG
std::cerr << "p3tunnel::pingTunnelConnection() sending ping with relay id : " << relayPeerId << std::endl; std::cerr << "p3tunnel::pingTunnelConnection() sending ping with relay id : " << relayPeerId << std::endl;
std::cerr << "ownId : " << ownId << std::endl; std::cerr << "ownId : " << ownId << std::endl;
std::cerr << "destPeerId : " << destPeerId << std::endl; std::cerr << "destPeerId : " << destPeerId << std::endl;
#endif
this->sendTunnelDataPrivate(1, relayPeerId, ownId, relayPeerId, destPeerId, NULL, 0); this->sendTunnelDataPrivate(1, relayPeerId, ownId, relayPeerId, destPeerId, NULL, 0);
} }