Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 14:20:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lots of bugfixes and tweaks:

Browse source 
* Switched p3Ranking to share Friends Links as well as own.
 * Modified rankmsgs to contain source id.
 * Fixed up rsNotify, added pqiNotify and global function call to get it.
 * Added notify for Bad Incoming Directory
 * Added Emergency Incoming directory so RS can keep running.
 * Added notify for Bad Packet (connecting to V0.3.X)
 * Added notify for Incomplete Packet Read (not been triggered yet!)
 * added close() to BinInterface, close on pqissl calls reset() 
 * removed exit(1) calls from pqistreamer, replaced with bio->close().
 * Increased Maximum Packet Size for HTML messages.
 * Fixed Online/Offline Message Forwarding. (TEST).
 * Increased DHT bootstrap buckets to 4.
 * Cleaned up much of serialiser debug (was slowing down Mac)
 * Added directory path to File Listings.
 * added ConvertSharedFilePath() so correct local dir can be found.
 * Added ForceDirectoryCheck() and InDirectoryCheck() for file hashing.
 * removed old TMP cache loading.
 * switched off Cache debug.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-31 14:06:59 +00:00
parent a76baa5421
commit 5e41b21cef
36 changed files with 632 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

43
libretroshare/src/rsserver/p3face-file.cc
View file

@ -357,4 +357,47 @@ int RsServer::SearchBoolExp(Expression *exp, std::list<FileDetail> &results)
return val;
}
bool RsServer::ConvertSharedFilePath(std::string path, std::string &fullpath)
{
lockRsCore(); /* LOCK */
/* call to filedexserver */
bool val = server->ConvertSharedFilePath(path, fullpath);
/* done! */
/* unlock Mutexes */
unlockRsCore(); /* UNLOCK */
return val;
}
void RsServer::ForceDirectoryCheck()
{
lockRsCore(); /* LOCK */
/* call to filedexserver */
server->ForceDirectoryCheck();
/* done! */
/* unlock Mutexes */
unlockRsCore(); /* UNLOCK */
}
bool RsServer::InDirectoryCheck()
{
lockRsCore(); /* LOCK */
/* call to filedexserver */
bool val = server->InDirectoryCheck();
/* done! */
/* unlock Mutexes */
unlockRsCore(); /* UNLOCK */
return val;
}

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

@ -472,13 +472,16 @@ int RsServer::StartupRetroShare(RsInit *config)
std::string certConfigFile = config->basedir.c_str();
std::string certNeighDir = config->basedir.c_str();
std::string emergencySaveDir = config->basedir.c_str();
if (certConfigFile != "")
{
certConfigFile += "/";
certNeighDir += "/";
emergencySaveDir += "/";
}
certConfigFile += configConfFile;
certNeighDir += configCertDir;
emergencySaveDir += "Downloads";
/* if we've loaded an old format file! */
bool oldFormat = false;
@ -510,8 +513,10 @@ int RsServer::StartupRetroShare(RsInit *config)
server = new filedexserver();
server->setConfigDir(config->basedir.c_str());
server->setSaveDir(config->homePath.c_str()); /* Default Save Dir - config will overwrite */
server->setSearchInterface(pqih, mAuthMgr, mConnMgr);
server->setFileCallback(ownId, mCacheStrapper, mCacheTransfer, &(getNotify()));
server->setEmergencySaveDir(emergencySaveDir); /* (after setFileCallback()) if saveDir invalid */
mConfigMgr = new p3ConfigMgr(mAuthMgr, config->basedir, "rs-v0.4.cfg", "rs-v0.4.sgn");
mGeneralConfig = new p3GeneralConfig();
@ -532,7 +537,7 @@ int RsServer::StartupRetroShare(RsInit *config)
std::string localcachedir = config_dir + "/cache/local";
std::string remotecachedir = config_dir + "/cache/remote";
mRanking = new p3Ranking(RS_SERVICE_TYPE_RANK,
mRanking = new p3Ranking(mConnMgr, RS_SERVICE_TYPE_RANK,
mCacheStrapper, mCacheTransfer,
localcachedir, remotecachedir, 3600 * 24 * 30);

3
libretroshare/src/rsserver/p3face.h
View file

@ -130,6 +130,9 @@ virtual int RequestDirDetails(void *ref, DirDetails &details, uint32_t flags);
virtual int SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results);
virtual int SearchBoolExp(Expression *exp, std::list<FileDetail> &results);
virtual bool ConvertSharedFilePath(std::string path, std::string &fullpath);
virtual void ForceDirectoryCheck();
virtual bool InDirectoryCheck();
/* Actions For Upload/Download */