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

code cleaning

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 21:03:36 +00:00
parent d2a1084c27
commit 6055c30832
3 changed files with 1 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/pqi/p3connmgr.cc
View file

@ -282,8 +282,6 @@ void p3ConnectMgr::setOwnNetConfig(uint32_t netMode, uint32_t visState)
void p3ConnectMgr::netReset()
{
std::cerr << "p3ConnectMgr::netReset()" << std::endl;
//don't do a net reset if the MIN_TIME_BETWEEN_NET_RESET is not reached
time_t delta = time(NULL) - mNetInitTS;
#ifdef CONN_DEBUG
@ -307,14 +305,12 @@ void p3ConnectMgr::netReset()
// Will initiate a new call for determining the external ip.
mExtAddrFinder->reset() ;
std::cerr << "p3ConnectMgr::netReset() reset NetStatus" << std::endl;
{
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
mNetStatus = RS_NET_UNKNOWN;
netStatusReset();
}
std::cerr << "p3ConnectMgr::netReset() checkNetAddress" << std::endl;
/* check Network Address */
checkNetAddress();
@ -710,7 +706,7 @@ void p3ConnectMgr::networkConsistencyCheck()
std::cerr << "p3ConnectMgr::networkConsistencyCheck() time since last reset : " << delta << std::endl;
#endif
bool doNetReset = false;
bool doNetReset = false;
//if one of the flag is degrated from true to false during last tick, let's do a reset
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::networkConsistencyCheck() net flags : " << std::endl;

2
libretroshare/src/rsserver/rsinit.cc
View file

@ -735,7 +735,6 @@ static bool checkAccount(std::string accountdir, accountId &id)
LoadCheckX509andGetName(cert_name.c_str(), id.sslName, id.sslId);
std::cerr << "sslName: " << id.sslName << " id: " << id.sslId << std::endl;
#ifndef PQI_USE_SSLONLY
std::string tmpid;
if (LoadCheckX509andGetIssuerName(cert_name.c_str(), id.pgpId, tmpid))
{
@ -751,7 +750,6 @@ static bool checkAccount(std::string accountdir, accountId &id)
ret = false;
}
#endif
return ret;
}