projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.28
[fms.git]
/
src
/
freenet
/
trustlistrequester.cpp
diff --git
a/src/freenet/trustlistrequester.cpp
b/src/freenet/trustlistrequester.cpp
index
77f4f4e
..
bedc845
100644
(file)
--- a/
src/freenet/trustlistrequester.cpp
+++ b/
src/freenet/trustlistrequester.cpp
@@
-15,12
+15,12
@@
TrustListRequester::TrustListRequester()
Initialize();
\r
}
\r
\r
Initialize();
\r
}
\r
\r
-TrustListRequester::TrustListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
\r
+TrustListRequester::TrustListRequester(FCPv2
::Connection
*fcp):IIndexRequester<long>(fcp)
\r
{
\r
Initialize();
\r
}
\r
\r
{
\r
Initialize();
\r
}
\r
\r
-const bool TrustListRequester::HandleAllData(FCPMessage &message)
\r
+const bool TrustListRequester::HandleAllData(FCP
v2::
Message &message)
\r
{
\r
Poco::DateTime now;
\r
SQLite3DB::Statement st;
\r
{
\r
Poco::DateTime now;
\r
SQLite3DB::Statement st;
\r
@@
-41,23
+41,16
@@
const bool TrustListRequester::HandleAllData(FCPMessage &message)
StringFunctions::Convert(idparts[2],index);
\r
\r
// wait for all data to be received from connection
\r
StringFunctions::Convert(idparts[2],index);
\r
\r
// wait for all data to be received from connection
\r
- while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)
\r
- {
\r
- m_fcp->Update(1);
\r
- }
\r
+ m_fcp->WaitForBytes(1000,datalength);
\r
\r
// if we got disconnected- return immediately
\r
\r
// if we got disconnected- return immediately
\r
- if(m_fcp->Connected()==false)
\r
+ if(m_fcp->
Is
Connected()==false)
\r
{
\r
return false;
\r
}
\r
\r
// receive the file
\r
{
\r
return false;
\r
}
\r
\r
// receive the file
\r
- data.resize(datalength);
\r
- if(data.size()>0)
\r
- {
\r
- m_fcp->ReceiveRaw(&data[0],datalength);
\r
- }
\r
+ m_fcp->Receive(data,datalength);
\r
\r
// get count of identities added in last 24 hours
\r
st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded>=?;");
\r
\r
// get count of identities added in last 24 hours
\r
st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded>=?;");
\r
@@
-238,7
+231,7
@@
const bool TrustListRequester::HandleAllData(FCPMessage &message)
\r
}
\r
\r
\r
}
\r
\r
-const bool TrustListRequester::HandleGetFailed(FCPMessage &message)
\r
+const bool TrustListRequester::HandleGetFailed(FCP
v2::
Message &message)
\r
{
\r
SQLite3DB::Statement st;
\r
std::vector<std::string> idparts;
\r
{
\r
SQLite3DB::Statement st;
\r
std::vector<std::string> idparts;
\r
@@
-315,7
+308,7
@@
void TrustListRequester::PopulateIDList()
void TrustListRequester::StartRequest(const long &identityid)
\r
{
\r
Poco::DateTime now;
\r
void TrustListRequester::StartRequest(const long &identityid)
\r
{
\r
Poco::DateTime now;
\r
- FCPMessage message;
\r
+ FCP
v2::
Message message;
\r
std::string publickey;
\r
int index;
\r
std::string indexstr;
\r
std::string publickey;
\r
int index;
\r
std::string indexstr;
\r
@@
-354,7
+347,7
@@
void TrustListRequester::StartRequest(const long &identityid)
message["ReturnType"]="direct";
\r
message["MaxSize"]="1000000"; // 1 MB
\r
\r
message["ReturnType"]="direct";
\r
message["MaxSize"]="1000000"; // 1 MB
\r
\r
- m_fcp->Send
Message
(message);
\r
+ m_fcp->Send(message);
\r
\r
m_requesting.push_back(identityid);
\r
}
\r
\r
m_requesting.push_back(identityid);
\r
}
\r