Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 07:47:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats 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); time_t startTime = time(NULL);
pqiConnectCbDummy cbTester; pqiConnectCbDummy cbTester;
OpenDHTMgr dhtTester(ownId, &cbTester); OpenDHTMgr dhtTester(ownId, &cbTester, ".");
/* startup dht */ /* startup dht */
std::cerr << "Starting up DhtTester()" << std::endl; 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) OpenDHTMgr::OpenDHTMgr(std::string ownId, pqiConnectCb* cb, std::string configdir)
:p3DhtMgr(ownId, cb) :p3DhtMgr(ownId, cb), mConfigDir(configdir)
{ {
return; return;
} }
@ -109,7 +109,7 @@ OpenDHTMgr::OpenDHTMgr(std::string ownId, pqiConnectCb* cb)
/********** OVERLOADED FROM p3DhtMgr ***************/ /********** OVERLOADED FROM p3DhtMgr ***************/
bool OpenDHTMgr::init() bool OpenDHTMgr::init()
{ {
std::string configpath = "."; std::string configpath = mConfigDir;
/* load up DHT gateways */ /* load up DHT gateways */
mClient = new OpenDHTClient(); mClient = new OpenDHTClient();
@ -120,7 +120,7 @@ bool OpenDHTMgr::init()
{ {
filename += "/"; filename += "/";
} }
filename += "servers.txt"; filename += "ODHTservers.txt";
if (!mClient -> loadServersFromWeb(filename)) if (!mClient -> loadServersFromWeb(filename))
{ {

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

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

2
libretroshare/src/pqi/p3connmgr.cc
View File

@ -43,7 +43,7 @@ const uint32_t RS_STUN_DHT = 0x0001;
const uint32_t RS_STUN_DONE = 0x0002; const uint32_t RS_STUN_DONE = 0x0002;
const uint32_t RS_STUN_LIST_MIN = 100; const uint32_t RS_STUN_LIST_MIN = 100;
const uint32_t MAX_UPNP_INIT = 60; /* seconds UPnP timeout */ const uint32_t MAX_UPNP_INIT = 30; /* seconds UPnP timeout */
/**** /****
* #define CONN_DEBUG 1 * #define CONN_DEBUG 1

3
libretroshare/src/pqi/p3dhtmgr.cc
View File

@ -1155,7 +1155,8 @@ bool p3DhtMgr::resultDHT(std::string key, std::string value)
*/ */
#ifdef DHT_DEBUG #ifdef DHT_DEBUG
std::cerr << "p3DhtMgr::resultDHT() key: " << key << " value: " << value << std::endl; std::cerr << "p3DhtMgr::resultDHT() key: 0x" << RsUtil::BinToHex(key);
std::cerr << " value: 0x" << RsUtil::BinToHex(value) << std::endl;
#endif #endif
/* variables for dhtResult() call */ /* variables for dhtResult() call */

2
libretroshare/src/rsserver/p3face-startup.cc
View File

@ -480,7 +480,7 @@ int RsServer::StartupRetroShare(RsInit *config)
mConnMgr = new p3ConnectMgr(mAuthMgr); mConnMgr = new p3ConnectMgr(mAuthMgr);
p3UpnpMgr *mUpnpMgr = new upnphandler(); p3UpnpMgr *mUpnpMgr = new upnphandler();
p3DhtMgr *mDhtMgr = new OpenDHTMgr(ownId, mConnMgr); p3DhtMgr *mDhtMgr = new OpenDHTMgr(ownId, mConnMgr, config->basedir);
CacheStrapper *mCacheStrapper = new CacheStrapper(mAuthMgr, mConnMgr); CacheStrapper *mCacheStrapper = new CacheStrapper(mAuthMgr, mConnMgr);
ftfiler *mCacheTransfer = new ftfiler(mCacheStrapper); ftfiler *mCacheTransfer = new ftfiler(mCacheStrapper);

6
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -75,6 +75,8 @@
* #define RS_RELEASE_VERSION 1 * #define RS_RELEASE_VERSION 1
****/ ****/
#define RS_RELEASE_VERSION 1
/** Constructor */ /** Constructor */
MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
: QMainWindow(parent, flags) : QMainWindow(parent, flags)
@ -187,9 +189,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
#ifdef RS_RELEASE_VERSION #ifdef RS_RELEASE_VERSION
addAction(new QAction(QIcon(IMAGE_PEERS), tr("In Development / New Apps"), ui.toolBar), SLOT(showApplWindow())); addAction(new QAction(QIcon(IMAGE_PEERS), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#else #else
addAction(new QAction(QIcon(IMAGE_PEERS), tr("In Development / New Apps"), ui.toolBar), SLOT(showApplWindow())); addAction(new QAction(QIcon(IMAGE_PEERS), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#endif #endif
#ifdef NO_MORE_OPTIONS_OR_SS #ifdef NO_MORE_OPTIONS_OR_SS

2
retroshare-gui/src/retroshare.nsi
View File

@ -2,7 +2,7 @@
; Define your application name ; Define your application name
!define APPNAME "RetroShare" !define APPNAME "RetroShare"
!define VERSION "0.3.52a" !define VERSION "0.4.01a"
!define APPNAMEANDVERSION "${APPNAME} ${VERSION}" !define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
; Main Install settings ; Main Install settings

2
retroshare-gui/src/util/rsversion.cpp
View File

@ -23,7 +23,7 @@
//#define USE_SVN_VERSIONS 1 //#define USE_SVN_VERSIONS 1
#define VERSION "0.3.52a" #define VERSION "0.4.01a"
#if USE_SVN_VERSIONS #if USE_SVN_VERSIONS
#include "svn_revision.h" #include "svn_revision.h"