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

Fixed upnp issues

Browse source 
* Removed periodic Check and thread.
 * Added Shutdown.
 * switched to terminating background thread.
 * removed temporary lease.
 * A bit of a HACK - this class could be cleaned up significantly.

Adding the start of forums/channels.
 * Dummy Interface and Forum data (so GUI work can start)
 * rough p3distrib - needs a lot of work.

Added shutdown function to p3connmgr, to shutdown Upnp.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-04-09 12:54:15 +00:00
parent 20c9e7d224
commit 94371600be
16 changed files with 2007 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/rsserver/p3face-config.cc
View file

@ -329,9 +329,6 @@ int RsServer::UpdateAllConfig()
}
void RsServer::ConfigFinalSave()
{
/* force saving of transfers */
@ -344,4 +341,6 @@ void RsServer::ConfigFinalSave()
void RsServer::rsGlobalShutDown()
{
ConfigFinalSave(); // save configuration before exit
mConnMgr->shutdown(); /* Handles UPnP */
}

10
libretroshare/src/rsserver/p3face-startup.cc
View file

@ -48,6 +48,7 @@
#include "services/p3gamelauncher.h"
#include "services/p3ranking.h"
#include "services/p3photoservice.h"
#include "services/p3forums.h"
#include <list>
#include <string>
@ -68,8 +69,10 @@
#include "pqi/p3notify.h" // HACK - moved to pqi for compilation order.
// UNCOMMENT THIS FOR UNFINISHED SERVICES
// COMMENT THIS FOR UNFINISHED SERVICES
/****
#define RS_RELEASE 1
****/
/**************** PQI_USE_XPGP ******************/
@ -557,6 +560,8 @@ int RsServer::StartupRetroShare(RsInit *config)
CachePair cp2(photoService, photoService, CacheId(RS_SERVICE_TYPE_PHOTO, 0));
mCacheStrapper -> addCachePair(cp2);
#else
mRanking = NULL;
@ -682,7 +687,6 @@ int RsServer::StartupRetroShare(RsInit *config)
/**************************************************************************/
server->StartupMonitor();
mUpnpMgr->start();
mDhtMgr->start();
@ -710,10 +714,12 @@ int RsServer::StartupRetroShare(RsInit *config)
rsGameLauncher = gameLauncher;
rsPhoto = new p3Photo(photoService);
rsRanks = new p3Rank(mRanking);
rsForums = new p3Forums();
#else
rsGameLauncher = NULL;
rsPhoto = NULL;
rsRanks = NULL;
rsForums = NULL;
#endif