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

More Tweaks before first release.

Browse source 
* Switched on RELEASE flag.
 * renamed incomplete work to "Unfinished"
 * updated version strings.
 * Added Configuration path to DhtMgr.
 * reduced uPnP timeout to 30 seconds (from 60).
 * more Bin -> BinToHex printouts.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-03 16:01:25 +00:00
parent 9bdd44d0f5
commit fd1beee309
9 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/dht/odhtmgr_test.cc
View file

@ -81,7 +81,7 @@ int main(int argc, char **argv)
time_t startTime = time(NULL);
pqiConnectCbDummy cbTester;
OpenDHTMgr dhtTester(ownId, &cbTester);
OpenDHTMgr dhtTester(ownId, &cbTester, ".");
/* startup dht */
std::cerr << "Starting up DhtTester()" << std::endl;

8
libretroshare/src/dht/opendhtmgr.cc
View file

@ -99,8 +99,8 @@ extern "C" void* doDhtSearch(void* p)
OpenDHTMgr::OpenDHTMgr(std::string ownId, pqiConnectCb* cb)
:p3DhtMgr(ownId, cb)
OpenDHTMgr::OpenDHTMgr(std::string ownId, pqiConnectCb* cb, std::string configdir)
:p3DhtMgr(ownId, cb), mConfigDir(configdir)
{
return;
}
@ -109,7 +109,7 @@ OpenDHTMgr::OpenDHTMgr(std::string ownId, pqiConnectCb* cb)
/********** OVERLOADED FROM p3DhtMgr ***************/
bool OpenDHTMgr::init()
{
std::string configpath = ".";
std::string configpath = mConfigDir;
/* load up DHT gateways */
mClient = new OpenDHTClient();
@ -120,7 +120,7 @@ bool OpenDHTMgr::init()
{
filename += "/";
}
filename += "servers.txt";
filename += "ODHTservers.txt";
if (!mClient -> loadServersFromWeb(filename))
{

3
libretroshare/src/dht/opendhtmgr.h
View file

@ -37,7 +37,7 @@ class OpenDHTMgr: public p3DhtMgr
{
public:
OpenDHTMgr(std::string ownId, pqiConnectCb* cb);
OpenDHTMgr(std::string ownId, pqiConnectCb* cb, std::string configdir);
protected:
@ -56,6 +56,7 @@ virtual bool searchDHT(std::string key);
private:
DHTClient *mClient;
std::string mConfigDir;
};