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

Modified Windows TCP hack.

Browse source 
- Reduced the limit of the half-open connections from 5 to 3.
- Only the TCP connections are queued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4540 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-08-07 18:48:48 +00:00
parent aa63ca1aa6
commit 0043320ea7
1 changed files with 55 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

54
libretroshare/src/pqi/pqipersongrp.cc
View file

@ -37,7 +37,7 @@ const int pqipersongrpzone = 354;
// hack for too many connections // hack for too many connections
#include "retroshare/rsinit.h" #include "retroshare/rsinit.h"
static std::list<std::string> waitingIds; static std::list<std::string> waitingIds;
#define MAX_CONNECT_COUNT 5 #define MAX_CONNECT_COUNT 3
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
#endif #endif
@ -351,7 +351,7 @@ void pqipersongrp::statusChanged()
connect_count++; connect_count++;
if (connect_count >= MAX_CONNECT_COUNT) { if (connect_count >= MAX_CONNECT_COUNT) {
#ifdef PGRP_DEBUG #ifdef PGRP_DEBUG
std::cerr << "pqipersongrp::connectPeer() Too many connections due to windows limitations. There are " << waitingIds.size() << " waiting connections." << std::endl; std::cerr << "pqipersongrp::statusChanged() Too many connections due to windows limitations. There are " << waitingIds.size() << " waiting connections." << std::endl;
#endif #endif
return; return;
} }
@ -361,7 +361,7 @@ void pqipersongrp::statusChanged()
} /* UNLOCKED */ } /* UNLOCKED */
#ifdef PGRP_DEBUG #ifdef PGRP_DEBUG
std::cerr << "pqipersongrp::connectPeer() There are " << connect_count << " connection attempts and " << waitingIds.size() << " waiting connections. Can start " << (MAX_CONNECT_COUNT - connect_count) << " connection attempts." << std::endl; std::cerr << "pqipersongrp::statusChanged() There are " << connect_count << " connection attempts and " << waitingIds.size() << " waiting connections. Can start " << (MAX_CONNECT_COUNT - connect_count) << " connection attempts." << std::endl;
#endif #endif
/* start some waiting id's */ /* start some waiting id's */
@ -371,6 +371,12 @@ void pqipersongrp::statusChanged()
} }
std::string waitingId = waitingIds.front(); std::string waitingId = waitingIds.front();
waitingIds.pop_front(); waitingIds.pop_front();
#ifdef PGRP_DEBUG
std::cerr << " pqipersongrp::statusChanged() id: " << waitingId << " connect peer";
std::cerr << std::endl;
#endif
connectPeer(waitingId, true); connectPeer(waitingId, true);
} }
} }
@ -499,13 +505,13 @@ int pqipersongrp::connectPeer(std::string id
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
{ {
RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
if (id == mLinkMgr->getOwnId()) if (id == mLinkMgr->getOwnId())
{ {
#ifdef PGRP_DEBUG
std::cerr << "pqipersongrp::connectPeer() ERROR Failed, connecting to own id." << std::endl; std::cerr << "pqipersongrp::connectPeer() ERROR Failed, connecting to own id." << std::endl;
#ifdef PGRP_DEBUG #endif
#endif
return 0; return 0;
} }
std::map<std::string, SearchModule *>::iterator it; std::map<std::string, SearchModule *>::iterator it;
@ -533,16 +539,50 @@ int pqipersongrp::connectPeer(std::string id
/* check for id is waiting */ /* check for id is waiting */
if (std::find(waitingIds.begin(), waitingIds.end(), id) != waitingIds.end()) { if (std::find(waitingIds.begin(), waitingIds.end(), id) != waitingIds.end()) {
/* id is waiting for a connection */ /* id is waiting for a connection */
#ifdef PGRP_DEBUG
std::cerr << " pqipersongrp::connectPeer() id: " << id << " is already waiting ";
std::cerr << std::endl;
#endif
return 0; return 0;
} }
/* add id to waiting */ /* check for connection type of the next connect attempt */
peerConnectState state;
if (mLinkMgr->getFriendNetStatus(id, state) == false) {
#ifdef PGRP_DEBUG
std::cerr << " pqipersongrp::connectPeer() id: " << id << " No friend net status";
std::cerr << std::endl;
#endif
return 0;
}
if (state.connAddrs.size() < 1) {
#ifdef PGRP_DEBUG
std::cerr << " pqipersongrp::connectPeer() id: " << id << " No existing connect addresses";
std::cerr << std::endl;
#endif
return 0;
}
const peerConnectAddress &currentConnAddrAttempt = state.connAddrs.front();
if (currentConnAddrAttempt.type & RS_NET_CONN_TCP_ALL) {
#ifdef PGRP_DEBUG
std::cerr << " pqipersongrp::connectPeer() id: " << id << " added to the waiting list";
std::cerr << std::endl;
#endif
/* TCP connect, add id to waiting */
waitingIds.push_back(id); waitingIds.push_back(id);
/* wait for call to connectPeer with empty id */ /* wait for call to connectPeer with empty id */
return 0; return 0;
} }
/* try all other types of connect directly */
#ifdef PGRP_DEBUG
std::cerr << " pqipersongrp::connectPeer() id: " << id << " connect directly without wait";
std::cerr << std::endl;
#endif
}
/* remove id from waiting */ /* remove id from waiting */
waitingIds.remove(id); waitingIds.remove(id);
} }