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

Networking REWORK: Major cleanup of p3ConnectMgr.

Browse source 
(Sorry for the ridiculously large check-in, wants to fix lots of stuff.)

Other Changes:
 * Added SSL Test Harness. (authssltest)
 * Added GPG Test Harness. (authssltest)
 * Reworked SSL/GPG startup to enable test harnesses
 * pqiperson: added notify of FAIL if connection method unavailable.
 * added p3tunnel to pqissltunnel init.
 * pqimonitor: added ipHistory to connect callback.
 
p3ConnectMgr Changes:
 * removed STUN system - wasn't operating correctly anyway without DHT.
 * switched to new IpAddress history data types. (removed lots of code)
 * Added Addr history for both Local and Ext addresses.
 * removed p3tunnel references in p3connmgr
 * fixed up mUseTunnelConnection flags (now used!)
 * fixed up mUseExtFinder flags (now used!)
 * added improved Net Status.
 * corrected UPNP / EXT / UDP startup. (was always UPNP).
 * fixed netReset() and netStartup().
 * removed unnecessary DEBUG code.
 * added UPNP timeout code (600 secs - why does it take so long?)
 * added improved netExtCheck().
 * removed wierd netConsistencyCheck() ... to rework.
 * corrected connect / reconnect code.
 * removed DHT notify code.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3247 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-07-04 10:35:38 +00:00
parent 85e1b4b111
commit f4331da483
18 changed files with 2345 additions and 1840 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libretroshare/src/pqi/p3dhtmgr.cc
View file

@ -1756,14 +1756,28 @@ bool p3DhtMgr::dhtResultSearch(std::string idhash,
if (doCb)
{
std::list<IpAddressTimed> ipAddressList;
mConnCb->peerStatus(ent.id, ent.laddr, ent.raddr,
ent.type, 0, RS_CB_DHT);
pqiIpAddrSet addrs;
pqiIpAddress laddr;
laddr.mAddr = ent.laddr;
laddr.mSeenTime = time(NULL);
laddr.mSrc = RS_CB_DHT;
addrs.updateLocalAddrs(laddr);
pqiIpAddress eaddr;
eaddr.mAddr = ent.raddr;
eaddr.mSeenTime = time(NULL);
eaddr.mSrc = RS_CB_DHT;
addrs.updateExtAddrs(eaddr);
mConnCb->peerStatus(ent.id, addrs, ent.type, 0, RS_CB_DHT);
}
if (doStun)
{
mConnCb->stunStatus(idhash, raddr, type, stunFlags);
//mConnCb->stunStatus(idhash, raddr, type, stunFlags);
}
return true;