Initialize();\r
}\r
\r
-IdentityIntroductionRequester::IdentityIntroductionRequester(FCPv2 *fcp):IFCPConnected(fcp)\r
+IdentityIntroductionRequester::IdentityIntroductionRequester(FCPv2::Connection *fcp):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
- if(data.size()>0)\r
- {\r
- m_fcp->ReceiveRaw(&data[0],datalength);\r
- }\r
+ m_fcp->Receive(data,datalength);\r
\r
// parse file into xml and update the database\r
if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\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
std::string day;\r
std::string solution;\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
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