X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fidentityintroductionrequester.cpp;h=b9532f30265a777c7cbdbdda889b0dabaedd5762;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=7def9f2c00e4d830605f691992b98884d9b6a204;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/identityintroductionrequester.cpp b/src/freenet/identityintroductionrequester.cpp
index 7def9f2..b9532f3 100644
--- a/src/freenet/identityintroductionrequester.cpp
+++ b/src/freenet/identityintroductionrequester.cpp
@@ -14,12 +14,12 @@
 	#include <xmem.h>
 #endif
 
-IdentityIntroductionRequester::IdentityIntroductionRequester()
+IdentityIntroductionRequester::IdentityIntroductionRequester(SQLite3DB::DB *db):IDatabase(db)
 {
 	Initialize();
 }
 
-IdentityIntroductionRequester::IdentityIntroductionRequester(FCPv2 *fcp):IFCPConnected(fcp)
+IdentityIntroductionRequester::IdentityIntroductionRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)
 {
 	Initialize();
 }
@@ -35,7 +35,7 @@ void IdentityIntroductionRequester::FCPDisconnected()
 	
 }
 
-const bool IdentityIntroductionRequester::HandleAllData(FCPMessage &message)
+const bool IdentityIntroductionRequester::HandleAllData(FCPv2::Message &message)
 {
 	FreenetSSK ssk;
 	Poco::DateTime date;
@@ -48,23 +48,19 @@ const bool IdentityIntroductionRequester::HandleAllData(FCPMessage &message)
 	StringFunctions::Convert(message["DataLength"],datalength);
 
 	// wait for all data to be received from connection
-	while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)
-	{
-		m_fcp->Update(1);
-	}
+	m_fcp->WaitForBytes(1000,datalength);
 
 	// if we got disconnected- return immediately
-	if(m_fcp->Connected()==false)
+	if(m_fcp->IsConnected()==false)
 	{
 		return false;
 	}
 
 	// receive the file
-	data.resize(datalength);
-	m_fcp->ReceiveRaw(&data[0],datalength);
+	m_fcp->Receive(data,datalength);
 
 	// parse file into xml and update the database
-	if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
+	if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)
 	{
 
 		ssk.SetPublicKey(xml.GetIdentity());
@@ -120,7 +116,7 @@ const bool IdentityIntroductionRequester::HandleAllData(FCPMessage &message)
 	return true;
 }
 
-const bool IdentityIntroductionRequester::HandleGetFailed(FCPMessage &message)
+const bool IdentityIntroductionRequester::HandleGetFailed(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 
@@ -143,7 +139,7 @@ const bool IdentityIntroductionRequester::HandleGetFailed(FCPMessage &message)
 	return true;
 }
 
-const bool IdentityIntroductionRequester::HandleMessage(FCPMessage &message)
+const bool IdentityIntroductionRequester::HandleMessage(FCPv2::Message &message)
 {
 
 	if(message["Identifier"].find("IdentityIntroductionRequester")==0)
@@ -181,19 +177,19 @@ const bool IdentityIntroductionRequester::HandleMessage(FCPMessage &message)
 
 void IdentityIntroductionRequester::Initialize()
 {
-	std::string tempval="";
-	Option::Instance()->Get("MaxIdentityIntroductionRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	m_maxrequests=0;
+	Option option(m_db);
+	option.GetInt("MaxIdentityIntroductionRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
-		m_log->error("Option MaxIdentityIntroductionRequests is currently set at "+tempval+".  It must be 1 or greater.");
+		m_log->error("Option MaxIdentityIntroductionRequests is currently less than 1.  It must be 1 or greater.");
 	}
 	if(m_maxrequests>100)
 	{
-		m_log->warning("Option MaxIdentityIntroductionRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
+		m_log->warning("Option MaxIdentityIntroductionRequests is currently set at more than 100.  This value might be incorrectly configured.");
 	}
-	Option::Instance()->Get("MessageBase",m_messagebase);
+	option.Get("MessageBase",m_messagebase);
 	m_tempdate=Poco::Timestamp();
 }
 
@@ -277,9 +273,8 @@ void IdentityIntroductionRequester::StartRequest(const std::string &UUID)
 {
 	std::string day;
 	std::string solution;
-//	std::vector<unsigned char> solutionhash;
 	std::string encodedhash;
-	FCPMessage message;
+	FCPv2::Message message;
 	SQLite3DB::Statement st=m_db->Prepare("SELECT Day, PuzzleSolution FROM tblIntroductionPuzzleInserts WHERE FoundSolution='false' AND UUID=?;");
 	st.Bind(0,UUID);
 	st.Step();
@@ -289,16 +284,12 @@ void IdentityIntroductionRequester::StartRequest(const std::string &UUID)
 		st.ResultText(0,day);
 		st.ResultText(1,solution);
 
+		// get the hash of the solution
 		Poco::SHA1Engine sha1;
 		sha1.update(solution);
 		encodedhash=Poco::DigestEngine::digestToHex(sha1.digest());
 		StringFunctions::UpperCase(encodedhash,encodedhash);
 
-		// get the hash of the solution
-//		solutionhash.resize(20);
-//		sha1((unsigned char *)solution.c_str(),solution.size(),&solutionhash[0]);
-//		Hex::Encode(solutionhash,encodedhash);
-
 		//start request for the solution
 		message.SetName("ClientGet");
 		message["URI"]="KSK@"+m_messagebase+"|"+day+"|"+UUID+"|"+encodedhash+".xml";
@@ -306,7 +297,7 @@ void IdentityIntroductionRequester::StartRequest(const std::string &UUID)
 		message["ReturnType"]="direct";
 		message["MaxSize"]="10000";
 
-		m_fcp->SendMessage(message);
+		m_fcp->Send(message);
 
 		m_requesting.push_back(UUID);