#include <xmem.h>\r
#endif\r
\r
-IdentityIntroductionRequester::IdentityIntroductionRequester()\r
+IdentityIntroductionRequester::IdentityIntroductionRequester(SQLite3DB::DB *db):IDatabase(db)\r
{\r
Initialize();\r
}\r
\r
-IdentityIntroductionRequester::IdentityIntroductionRequester(FCPv2 *fcp):IFCPConnected(fcp)\r
+IdentityIntroductionRequester::IdentityIntroductionRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)\r
{\r
Initialize();\r
}\r
\r
}\r
\r
-const bool IdentityIntroductionRequester::HandleAllData(FCPMessage &message)\r
+const bool IdentityIntroductionRequester::HandleAllData(FCPv2::Message &message)\r
{\r
FreenetSSK ssk;\r
Poco::DateTime date;\r
StringFunctions::Convert(message["DataLength"],datalength);\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
- if(m_fcp->Connected()==false)\r
+ if(m_fcp->IsConnected()==false)\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
// 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
\r
ssk.SetPublicKey(xml.GetIdentity());\r
return true;\r
}\r
\r
-const bool IdentityIntroductionRequester::HandleGetFailed(FCPMessage &message)\r
+const bool IdentityIntroductionRequester::HandleGetFailed(FCPv2::Message &message)\r
{\r
std::vector<std::string> idparts;\r
\r
return true;\r
}\r
\r
-const bool IdentityIntroductionRequester::HandleMessage(FCPMessage &message)\r
+const bool IdentityIntroductionRequester::HandleMessage(FCPv2::Message &message)\r
{\r
\r
if(message["Identifier"].find("IdentityIntroductionRequester")==0)\r
\r
void IdentityIntroductionRequester::Initialize()\r
{\r
- std::string tempval="";\r
- Option::Instance()->Get("MaxIdentityIntroductionRequests",tempval);\r
- StringFunctions::Convert(tempval,m_maxrequests);\r
+ m_maxrequests=0;\r
+ Option option(m_db);\r
+ option.GetInt("MaxIdentityIntroductionRequests",m_maxrequests);\r
if(m_maxrequests<1)\r
{\r
m_maxrequests=1;\r
- m_log->error("Option MaxIdentityIntroductionRequests is currently set at "+tempval+". It must be 1 or greater.");\r
+ m_log->error("Option MaxIdentityIntroductionRequests is currently less than 1. It must be 1 or greater.");\r
}\r
if(m_maxrequests>100)\r
{\r
- m_log->warning("Option MaxIdentityIntroductionRequests is currently set at "+tempval+". This value might be incorrectly configured.");\r
+ m_log->warning("Option MaxIdentityIntroductionRequests is currently set at more than 100. This value might be incorrectly configured.");\r
}\r
- Option::Instance()->Get("MessageBase",m_messagebase);\r
+ option.Get("MessageBase",m_messagebase);\r
m_tempdate=Poco::Timestamp();\r
}\r
\r
{\r
std::string day;\r
std::string solution;\r
-// std::vector<unsigned char> solutionhash;\r
std::string encodedhash;\r
- FCPMessage message;\r
+ FCPv2::Message message;\r
SQLite3DB::Statement st=m_db->Prepare("SELECT Day, PuzzleSolution FROM tblIntroductionPuzzleInserts WHERE FoundSolution='false' AND UUID=?;");\r
st.Bind(0,UUID);\r
st.Step();\r
st.ResultText(0,day);\r
st.ResultText(1,solution);\r
\r
+ // get the hash of the solution\r
Poco::SHA1Engine sha1;\r
sha1.update(solution);\r
encodedhash=Poco::DigestEngine::digestToHex(sha1.digest());\r
StringFunctions::UpperCase(encodedhash,encodedhash);\r
\r
- // get the hash of the solution\r
-// solutionhash.resize(20);\r
-// sha1((unsigned char *)solution.c_str(),solution.size(),&solutionhash[0]);\r
-// Hex::Encode(solutionhash,encodedhash);\r
-\r
//start request for the solution\r
message.SetName("ClientGet");\r
message["URI"]="KSK@"+m_messagebase+"|"+day+"|"+UUID+"|"+encodedhash+".xml";\r
message["ReturnType"]="direct";\r
message["MaxSize"]="10000";\r
\r
- m_fcp->SendMessage(message);\r
+ m_fcp->Send(message);\r
\r
m_requesting.push_back(UUID);\r
\r