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

* Added rstlvimage.cc to serialiser (missed in other checkin).

Browse source 
* Added Forum ID to configuration Manager.
 * added proper startup for p3Forums.
 * updated forums/distrib interfaces.
 * Switch Auto-Login on by default.
 * switched out lots of debugging.
 * add RM libretroshare.a to top-level Makefile.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-06-13 15:42:08 +00:00
parent 14dac82c85
commit fe284b628a
11 changed files with 249 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ RsInit *InitRsConfig()
strcpy(config->inet, "127.0.0.1");
strcpy(config->logfname, "");
config -> autoLogin = false;
config -> autoLogin = true; // Always on now.
config -> passwd = "";
config -> havePasswd = false;
config -> haveDebugLevel = false;
@ -592,15 +592,20 @@ int RsServer::StartupRetroShare(RsInit *config)
CachePair cp3(mQblog, mQblog, CacheId(RS_SERVICE_TYPE_QBLOG, 0));
mCacheStrapper -> addCachePair(cp3);
p3Forums *mForums = new p3Forums(RS_SERVICE_TYPE_FORUM,
mCacheStrapper, mCacheTransfer,
localcachedir, remotecachedir);
CachePair cp4(mForums, mForums, CacheId(RS_SERVICE_TYPE_FORUM, 0));
mCacheStrapper -> addCachePair(cp4);
pqih -> addService(mForums); /* This must be also ticked as a service */
#else
mRanking = NULL;
mQBlog = NULL;
mForums = NULL;
#endif
/**************************************************************************/
mConnMgr->setDhtMgr(mDhtMgr);
@ -624,6 +629,7 @@ int RsServer::StartupRetroShare(RsInit *config)
#ifndef RS_RELEASE
mConfigMgr->addConfiguration("ranklink.cfg", mRanking);
mConfigMgr->addConfiguration("qblog.cfg", mQblog);
mConfigMgr->addConfiguration("forums.cfg", mForums);
#endif
/**************************************************************************/
@ -751,7 +757,7 @@ int RsServer::StartupRetroShare(RsInit *config)
rsGameLauncher = gameLauncher;
rsPhoto = new p3Photo(photoService);
rsRanks = new p3Rank(mRanking);
rsForums = new p3Forums();
rsForums = mForums;
rsStatus = new p3Status();
rsQblog = new p3Blog(mQblog);

5
libretroshare/src/rsserver/p3peers.cc
View file

@ -32,6 +32,10 @@
RsPeers *rsPeers = NULL;
/*******
* #define P3PEERS_DEBUG 1
*******/
static uint32_t RsPeerTranslateTrust(uint32_t trustLvl);
int ensureExtension(std::string &name, std::string def_ext);
@ -115,7 +119,6 @@ std::string RsPeerLastConnectString(uint32_t lastConnect)
return out.str();
}
#define P3PEERS_DEBUG 1
p3Peers::p3Peers(p3ConnectMgr *cm, p3AuthMgr *am)
:mConnMgr(cm), mAuthMgr(am)