get rid of p3authmgr

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

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;