Initialize();\r
}\r
\r
-IdentityRequester::IdentityRequester(FCPv2 *fcp):IFCPConnected(fcp)\r
+IdentityRequester::IdentityRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
{\r
Initialize();\r
}\r
\r
-void IdentityRequester::FCPConnected()\r
-{\r
- m_requesting.clear();\r
- PopulateIDList();\r
-}\r
-\r
-void IdentityRequester::FCPDisconnected()\r
-{\r
- \r
-}\r
-\r
const bool IdentityRequester::HandleAllData(FCPMessage &message)\r
{\r
DateTime now;\r
IdentityXML xml;\r
long identityid;\r
long index;\r
+ std::string name="";\r
\r
now.SetToGMTime();\r
StringFunctions::Split(message["Identifier"],"|",idparts);\r
if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
{\r
\r
- st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=? WHERE IdentityID=?");\r
- st.Bind(0,xml.GetName());\r
+ st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=?, FreesiteEdition=? WHERE IdentityID=?");\r
+ name=xml.GetName();\r
+ if(name.size()>40)\r
+ {\r
+ name.erase(40);\r
+ }\r
+ st.Bind(0,name);\r
if(xml.GetSingleUse()==true)\r
{\r
st.Bind(1,"true");\r
st.Bind(1,"false");\r
}\r
st.Bind(2,now.Format("%Y-%m-%d %H:%M:%S"));\r
- st.Bind(3,identityid);\r
+ if(xml.GetPublishTrustList()==true)\r
+ {\r
+ st.Bind(3,"true");\r
+ }\r
+ else\r
+ {\r
+ st.Bind(3,"false");\r
+ }\r
+ if(xml.GetPublishBoardList()==true)\r
+ {\r
+ st.Bind(4,"true");\r
+ }\r
+ else\r
+ {\r
+ st.Bind(4,"false");\r
+ }\r
+ if(xml.GetFreesiteEdition()>=0)\r
+ {\r
+ st.Bind(5,xml.GetFreesiteEdition());\r
+ }\r
+ else\r
+ {\r
+ st.Bind(5);\r
+ }\r
+ st.Bind(6,identityid);\r
st.Step();\r
st.Finalize();\r
\r
st.Step();\r
st.Finalize();\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,__FUNCTION__" parsed Identity XML file : "+message["Identifier"]);\r
+ m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IdentityRequester::HandleAllData parsed Identity XML file : "+message["Identifier"]);\r
}\r
else\r
{\r
st.Step();\r
st.Finalize();\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" error parsing Identity XML file : "+message["Identifier"]);\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IdentityRequester::HandleAllData error parsing Identity XML file : "+message["Identifier"]);\r
}\r
\r
// remove this identityid from request list\r
st.Step();\r
st.Finalize();\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" fatal error requesting "+message["Identifier"]);\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IdentityRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
}\r
\r
// remove this identityid from request list\r
\r
}\r
\r
-const bool IdentityRequester::HandleMessage(FCPMessage &message)\r
-{\r
-\r
- if(message["Identifier"].find("IdentityRequester")==0)\r
- {\r
- if(message.GetName()=="DataFound")\r
- {\r
- return true;\r
- }\r
-\r
- if(message.GetName()=="AllData")\r
- {\r
- return HandleAllData(message);\r
- }\r
-\r
- if(message.GetName()=="GetFailed")\r
- {\r
- return HandleGetFailed(message);\r
- }\r
-\r
- if(message.GetName()=="IdentifierCollision")\r
- {\r
- // remove one of the ids from the requesting list\r
- long identityid=0;\r
- std::vector<std::string> idparts;\r
- StringFunctions::Split(message["Identifier"],"|",idparts);\r
- StringFunctions::Convert(idparts[1],identityid);\r
- RemoveFromRequestList(identityid);\r
- return true;\r
- }\r
- }\r
-\r
- return false;\r
-}\r
-\r
void IdentityRequester::Initialize()\r
{\r
std::string tempval="";\r
- Option::instance()->Get("MaxIdentityRequests",tempval);\r
+ m_fcpuniquename="IdentityRequester";\r
+ Option::Instance()->Get("MaxIdentityRequests",tempval);\r
StringFunctions::Convert(tempval,m_maxrequests);\r
if(m_maxrequests<1)\r
{\r
{\r
m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIdentityRequests is currently set at "+tempval+". This value might be incorrectly configured.");\r
}\r
- Option::instance()->Get("MessageBase",m_messagebase);\r
- m_tempdate.SetToGMTime();\r
}\r
\r
void IdentityRequester::PopulateIDList()\r
int id;\r
\r
date.SetToGMTime();\r
- date.Add(0,0,-1);\r
+ date.SetHour(0);\r
+ date.SetMinute(0);\r
+ date.SetSecond(0);\r
\r
- // select identities we want to query (haven't seen in last hour) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)\r
- SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND (LastSeen IS NULL OR LastSeen<='"+date.Format("%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+ // select identities we want to query (haven't seen yet today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)\r
+ SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND (LastSeen IS NULL OR LastSeen<'"+date.Format("%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
st.Step();\r
\r
m_ids.clear();\r
}\r
}\r
\r
-void IdentityRequester::Process()\r
-{\r
- // max is the smaller of the config value or the total number of identities we will request from\r
- long max=m_maxrequests>m_ids.size() ? m_ids.size() : m_maxrequests;\r
-\r
- // try to keep up to max requests going\r
- if(m_requesting.size()<max)\r
- {\r
- std::map<long,bool>::iterator i=m_ids.begin();\r
- while(i!=m_ids.end() && (*i).second==true)\r
- {\r
- i++;\r
- }\r
-\r
- if(i!=m_ids.end())\r
- {\r
- StartRequest((*i).first);\r
- }\r
- else\r
- {\r
- // we requested from all ids in the list, repopulate the list\r
- PopulateIDList();\r
- }\r
- }\r
- // special case - if there were 0 identities on the list when we started then we will never get a chance to repopulate the list\r
- // this will recheck for ids every minute\r
- DateTime now;\r
- now.SetToGMTime();\r
- if(m_tempdate<(now-(1.0/1440.0)))\r
- {\r
- PopulateIDList();\r
- m_tempdate=now;\r
- }\r
-\r
-}\r
-\r
-void IdentityRequester::RemoveFromRequestList(const long identityid)\r
-{\r
- std::vector<long>::iterator i=m_requesting.begin();\r
- while(i!=m_requesting.end() && (*i)!=identityid)\r
- {\r
- i++;\r
- }\r
- if(i!=m_requesting.end())\r
- {\r
- m_requesting.erase(i);\r
- }\r
-}\r
-\r
-void IdentityRequester::RegisterWithThread(FreenetMasterThread *thread)\r
-{\r
- thread->RegisterFCPConnected(this);\r
- thread->RegisterFCPMessageHandler(this);\r
- thread->RegisterPeriodicProcessor(this);\r
-}\r
-\r
-void IdentityRequester::StartRequest(const long identityid)\r
+void IdentityRequester::StartRequest(const long &identityid)\r
{\r
DateTime now;\r
FCPMessage message;\r
\r
message.SetName("ClientGet");\r
message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|Identity|"+indexstr+".xml";\r
- message["Identifier"]="IdentityRequester|"+identityidstr+"|"+indexstr+"|"+message["URI"];\r
+ message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"];\r
message["ReturnType"]="direct";\r
message["MaxSize"]="10000"; // 10 KB\r
\r