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

get rid of p3authmgr

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 20:56:55 +00:00
parent 2917896834
commit c23407cae3
46 changed files with 254 additions and 874 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/ft/ftdbase.cc
View file

@ -262,8 +262,8 @@ void ftFiMonitor::setSharedDirectories(std::list<SharedDirInfo> dirList)
ftCacheStrapper::ftCacheStrapper(p3AuthMgr *am, p3ConnectMgr *cm)
:CacheStrapper(am, cm)
ftCacheStrapper::ftCacheStrapper(p3ConnectMgr *cm)
:CacheStrapper(cm)
{
return;
}

2
libretroshare/src/ft/ftdbase.h
View file

@ -78,7 +78,7 @@ virtual bool loadList(std::list<RsItem *> load);
class ftCacheStrapper: public CacheStrapper, public ftSearch
{
public:
ftCacheStrapper(p3AuthMgr *am, p3ConnectMgr *cm);
ftCacheStrapper(p3ConnectMgr *cm);
/* overloaded search function */
virtual bool search(std::string hash, uint32_t hintflags, FileInfo &info) const;

10
libretroshare/src/ft/ftserver.cc
View file

@ -55,15 +55,15 @@ const int ftserverzone = 29539;
***/
/* Setup */
ftServer::ftServer(p3AuthMgr *authMgr, p3ConnectMgr *connMgr)
: mP3iface(NULL),
mAuthMgr(authMgr), mConnMgr(connMgr),
ftServer::ftServer(p3ConnectMgr *connMgr)
: mP3iface(NULL),
mConnMgr(connMgr),
mCacheStrapper(NULL),
mFiStore(NULL), mFiMon(NULL),
mFtController(NULL), mFtExtra(NULL),
mFtDataplex(NULL), mFtSearch(NULL)
{
mCacheStrapper = new ftCacheStrapper(authMgr, connMgr);
mCacheStrapper = new ftCacheStrapper(connMgr);
}
void ftServer::setConfigDirectory(std::string path)
@ -858,7 +858,7 @@ bool ftServer::handleCacheData()
data.name = ci->file.name;
data.path = ci->file.path;
data.pid = ci->PeerId();
data.pname = mAuthMgr->getName(ci->PeerId());
data.pname = getAuthSSL()->getName(ci->PeerId());
mCacheStrapper->recvCacheResponse(data, time(NULL));
delete ci;

2
libretroshare/src/ft/ftserver.h
View file

@ -79,7 +79,7 @@ class ftServer: public RsFiles, public ftDataSend, public RsThread
/******************** Setup ************************************/
/***************************************************************/
ftServer(p3AuthMgr *authMgr, p3ConnectMgr *connMgr);
ftServer(p3ConnectMgr *connMgr);
/* Assign important variables */
void setConfigDirectory(std::string path);