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.29
[fms.git]
/
src
/
freenet
/
trustlistrequester.cpp
diff --git
a/src/freenet/trustlistrequester.cpp
b/src/freenet/trustlistrequester.cpp
index
be6bfc1
..
96d24df
100644
(file)
--- a/
src/freenet/trustlistrequester.cpp
+++ b/
src/freenet/trustlistrequester.cpp
@@
-10,17
+10,17
@@
#include <xmem.h>
\r
#endif
\r
\r
#include <xmem.h>
\r
#endif
\r
\r
-TrustListRequester::TrustListRequester()
\r
+TrustListRequester::TrustListRequester(
SQLite3DB::DB *db):IIndexRequester<long>(db
)
\r
{
\r
Initialize();
\r
}
\r
\r
{
\r
Initialize();
\r
}
\r
\r
-TrustListRequester::TrustListRequester(
FCPv2 *fcp):IIndexRequester<long>(
fcp)
\r
+TrustListRequester::TrustListRequester(
SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,
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,20
+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
- m_fcp->ReceiveRaw(&data[0],datalength);
\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
@@
-92,7
+88,7
@@
const bool TrustListRequester::HandleAllData(FCPMessage &message)
now=Poco::DateTime();
\r
\r
// parse file into xml and update the database
\r
now=Poco::DateTime();
\r
\r
// parse file into xml and update the database
\r
- if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
\r
+ if(
data.size()>0 &&
xml.ParseXML(std::string(data.begin(),data.end()))==true)
\r
{
\r
// find the identity name and public key of the identity publishing the trust list
\r
std::string publisherid="";
\r
{
\r
// find the identity name and public key of the identity publishing the trust list
\r
std::string publisherid="";
\r
@@
-113,6
+109,8
@@
const bool TrustListRequester::HandleAllData(FCPMessage &message)
}
\r
st.Finalize();
\r
\r
}
\r
st.Finalize();
\r
\r
+ m_db->Execute("BEGIN;");
\r
+
\r
// drop all existing peer trust from this identity - we will rebuild it when we go through each trust in the xml file
\r
st=m_db->Prepare("DELETE FROM tblPeerTrust WHERE IdentityID=?;");
\r
st.Bind(0,identityid);
\r
// drop all existing peer trust from this identity - we will rebuild it when we go through each trust in the xml file
\r
st=m_db->Prepare("DELETE FROM tblPeerTrust WHERE IdentityID=?;");
\r
st.Bind(0,identityid);
\r
@@
-213,6
+211,8
@@
const bool TrustListRequester::HandleAllData(FCPMessage &message)
st.Step();
\r
st.Finalize();
\r
\r
st.Step();
\r
st.Finalize();
\r
\r
+ m_db->Execute("COMMIT;");
\r
+
\r
m_log->debug("TrustListRequester::HandleAllData parsed TrustList XML file : "+message["Identifier"]);
\r
}
\r
else
\r
m_log->debug("TrustListRequester::HandleAllData parsed TrustList XML file : "+message["Identifier"]);
\r
}
\r
else
\r
@@
-235,7
+235,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
@@
-270,8
+270,10
@@
void TrustListRequester::Initialize()
{
\r
std::string tempval="";
\r
m_fcpuniquename="TrustListRequester";
\r
{
\r
std::string tempval="";
\r
m_fcpuniquename="TrustListRequester";
\r
- Option::Instance()->Get("MaxIdentityRequests",tempval);
\r
- StringFunctions::Convert(tempval,m_maxrequests);
\r
+ m_maxrequests=0;
\r
+ Option option(m_db);
\r
+
\r
+ option.GetInt("MaxIdentityRequests",m_maxrequests);
\r
if(m_maxrequests<1)
\r
{
\r
m_maxrequests=1;
\r
if(m_maxrequests<1)
\r
{
\r
m_maxrequests=1;
\r
@@
-311,7
+313,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
@@
-350,7
+352,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