X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fidentityinserter.cpp;h=85fe2f4ef10f291c6a3a6656cb34b4b48f5b9cd6;hb=ed0732b2550c23c05fc9faf925620e87ee6dee12;hp=f28a73851894b13875bf2e31eeb8c1a6b7bf5981;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/identityinserter.cpp b/src/freenet/identityinserter.cpp
index f28a738..85fe2f4 100644
--- a/src/freenet/identityinserter.cpp
+++ b/src/freenet/identityinserter.cpp
@@ -10,12 +10,12 @@
 	#include <xmem.h>
 #endif
 
-IdentityInserter::IdentityInserter()
+IdentityInserter::IdentityInserter(SQLite3DB::DB *db):IDatabase(db)
 {
 	Initialize();
 }
 
-IdentityInserter::IdentityInserter(FCPv2 *fcp):IFCPConnected(fcp)
+IdentityInserter::IdentityInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)
 {
 	Initialize();
 }
@@ -55,7 +55,7 @@ void IdentityInserter::FCPDisconnected()
 	
 }
 
-const bool IdentityInserter::HandleMessage(FCPMessage &message)
+const bool IdentityInserter::HandleMessage(FCPv2::Message &message)
 {
 
 	if(message["Identifier"].find("IdentityInserter")==0)
@@ -84,29 +84,45 @@ const bool IdentityInserter::HandleMessage(FCPMessage &message)
 			Poco::DateTime lastdate;
 			int tzdiff=0;
 			Poco::DateTimeParser::tryParse("%Y-%m-%d",idparts[4],lastdate,tzdiff);
-
-			if(lastdate.day()==now.day())
+	
+			// do check to make sure this is the non-editioned SSK - we ignore failure/success for editioned SSK for now
+			if(message["Identifier"].find(".xml")!=std::string::npos)
 			{
-				m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false', LastInsertedIdentity='"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S")+"' WHERE LocalIdentityID="+idparts[1]+";");
+				if(lastdate.day()==now.day())
+				{
+					m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false', LastInsertedIdentity='"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S")+"' WHERE LocalIdentityID="+idparts[1]+";");
+				}
+				else
+				{
+					m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false' WHERE LocalIdentityID="+idparts[1]+";");
+				}
+				m_db->Execute("INSERT INTO tblLocalIdentityInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
+				m_log->debug("IdentityInserter::HandleMessage inserted Identity xml");
 			}
 			else
 			{
-				m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false' WHERE LocalIdentityID="+idparts[1]+";");
+				m_log->trace("IdentityInserter::HandleMessage inserted editioned Identity xml");
 			}
-			m_db->Execute("INSERT INTO tblLocalIdentityInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
-			m_log->debug("IdentityInserter::HandleMessage inserted Identity xml");
 			return true;
 		}
 
 		if(message.GetName()=="PutFailed")
 		{
-			m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false' WHERE LocalIdentityID="+idparts[1]+";");
-			m_log->debug("IdentityInserter::HandleMessage failure inserting Identity xml.  Code="+message["Code"]+" Description="+message["CodeDescription"]);
-			
-			// if code 9 (collision), then insert index into inserted table
-			if(message["Code"]=="9")
+			// do check to make sure this is the non-editioned SSK - we ignore failure/success for editioned SSK for now
+			if(message["Identifier"].find(".xml")!=std::string::npos)
 			{
-				m_db->Execute("INSERT INTO tblLocalIdentityInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
+				m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='false' WHERE LocalIdentityID="+idparts[1]+";");
+				m_log->debug("IdentityInserter::HandleMessage failure inserting Identity xml.  Code="+message["Code"]+" Description="+message["CodeDescription"]);
+				
+				// if code 9 (collision), then insert index into inserted table
+				if(message["Code"]=="9")
+				{
+					m_db->Execute("INSERT INTO tblLocalIdentityInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
+				}
+			}
+			else
+			{
+				m_log->trace("IdentityInserter::HandleMessage PutFailed for editioned SSK error code "+message["Code"]+ " id "+message["Identifier"]);
 			}
 			
 			return true;
@@ -154,7 +170,7 @@ void IdentityInserter::StartInsert(const long localidentityid)
 	if(rs.Empty()==false)
 	{
 		IdentityXML idxml;
-		FCPMessage mess;
+		FCPv2::Message mess;
 		Poco::DateTime now;
 		std::string messagebase;
 		std::string data;
@@ -184,7 +200,8 @@ void IdentityInserter::StartInsert(const long localidentityid)
 		}
 		StringFunctions::Convert(index,indexstr);
 
-		Option::Instance()->Get("MessageBase",messagebase);
+		Option option(m_db);
+		option.Get("MessageBase",messagebase);
 
 		if(rs.GetField(0))
 		{
@@ -232,8 +249,18 @@ void IdentityInserter::StartInsert(const long localidentityid)
 		mess["Identifier"]="IdentityInserter|"+idstring+"|"+indexstr+"|"+mess["URI"];
 		mess["UploadFrom"]="direct";
 		mess["DataLength"]=datasizestr;
-		m_fcp->SendMessage(mess);
-		m_fcp->SendRaw(data.c_str(),data.size());
+		m_fcp->Send(mess);
+		m_fcp->Send(std::vector<char>(data.begin(),data.end()));
+
+		// test insert as editioned SSK
+		mess.Clear();
+		mess.SetName("ClientPut");
+		mess["URI"]=privatekey+messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|Identity|-"+indexstr;
+		mess["Identifier"]="IdentityInserter|"+mess["URI"];
+		mess["UploadFrom"]="direct";
+		mess["DataLength"]=datasizestr;
+		m_fcp->Send(mess);
+		m_fcp->Send(std::vector<char>(data.begin(),data.end()));
 
 		m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='true' WHERE LocalIdentityID="+idstring+";");