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.20
[fms.git]
/
src
/
freenet
/
trustlistrequester.cpp
diff --git
a/src/freenet/trustlistrequester.cpp
b/src/freenet/trustlistrequester.cpp
index
be6bfc1
..
77f4f4e
100644
(file)
--- a/
src/freenet/trustlistrequester.cpp
+++ b/
src/freenet/trustlistrequester.cpp
@@
-54,7
+54,10
@@
const bool TrustListRequester::HandleAllData(FCPMessage &message)
\r
// receive the file
\r
data.resize(datalength);
\r
\r
// receive the file
\r
data.resize(datalength);
\r
- m_fcp->ReceiveRaw(&data[0],datalength);
\r
+ if(data.size()>0)
\r
+ {
\r
+ m_fcp->ReceiveRaw(&data[0],datalength);
\r
+ }
\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
+95,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
@@
-270,8
+273,9
@@
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
+
\r
+ m_maxrequests=0;
\r
+ Option::Instance()->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