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

Commit of the new UDP Connection methods and

Browse source 
the rewrite of the retroshare core networking stack.

This check-in commits the changes to the rsserver code.
Major changes to use the new networking code. Added
p3peers.h as a new interface for peer/neighbour management.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-01-25 07:58:29 +00:00
parent 7c2d5611bd
commit fd8adceb7e
13 changed files with 1039 additions and 701 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libretroshare/src/rsserver/p3face-server.cc
View file

@ -45,6 +45,7 @@ RsServer::~RsServer()
----> MUST BE LOCKED!
*/
#if 0
cert *RsServer::intFindCert(RsCertId id)
{
certsign cs;
@ -59,6 +60,7 @@ RsCertId RsServer::intGetCertId(cert *c)
RsCertId id = convert_to_str(cs);
return id;
}
#endif
#ifdef WINDOWS_SYS
#include <time.h>
@ -122,9 +124,14 @@ void RsServer::run()
/******************************** RUN SERVER *****************/
lockRsCore();
// std::cerr << "RsServer::run() Lock() -> Run()" << std::endl;
int moreToTick = server -> tick();
unlockRsCore();
/* tick the connection Manager */
mConnMgr->tick();
/******************************** RUN SERVER *****************/
/* adjust tick rate depending on whether there is more.
@ -184,9 +191,9 @@ void RsServer::run()
// These two have been completed!
//std::cerr << "RsServer::run() UpdateAllCerts()" << std::endl;
UpdateAllCerts();
//UpdateAllCerts();
//std::cerr << "RsServer::run() UpdateAllNetwork()" << std::endl;
UpdateAllNetwork();
//UpdateAllNetwork();
// currently Dummy Functions.
//std::cerr << "RsServer::run() UpdateAllTransfers()" << std::endl;
@ -210,7 +217,7 @@ void RsServer::run()
//std::cerr << "RsServer::run() CheckDHT()" << std::endl;
CheckNetworking();
//CheckNetworking();
}
@ -222,7 +229,7 @@ void RsServer::run()
// save the config every 5 minutes.
if (min % 5 == 1)
{
ConfigSave();
//ConfigSave();
#ifdef PQI_USE_CHANNELS
/* hack to update for now
* Only occassionally - cos disabled