X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessageinserter.cpp;h=f3aab0066e882b4652dc59e4723dedd6bb3265c0;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=0c032048e8bca8461db99b07ee26fcefaf48d94f;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/messageinserter.cpp b/src/freenet/messageinserter.cpp
index 0c03204..f3aab00 100644
--- a/src/freenet/messageinserter.cpp
+++ b/src/freenet/messageinserter.cpp
@@ -5,12 +5,12 @@
 #include <Poco/DateTimeFormatter.h>
 #include <Poco/Timestamp.h>
 
-MessageInserter::MessageInserter()
+MessageInserter::MessageInserter(SQLite3DB::DB *db):IIndexInserter<std::string>(db)
 {
 	Initialize();
 }
 
-MessageInserter::MessageInserter(FCPv2 *fcp):IIndexInserter<std::string>(fcp)
+MessageInserter::MessageInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<std::string>(db,fcp)
 {
 	Initialize();
 }
@@ -46,7 +46,7 @@ void MessageInserter::CheckForNeededInsert()
 	}
 }
 
-const bool MessageInserter::HandlePutFailed(FCPMessage &message)
+const bool MessageInserter::HandlePutFailed(FCPv2::Message &message)
 {
 	int index;
 	int localidentityid;
@@ -65,12 +65,14 @@ const bool MessageInserter::HandlePutFailed(FCPMessage &message)
 		st.Step();
 	}
 
+	m_log->trace("MessageInserter::HandlePutFailed error code "+message["Code"]+" fatal="+message["Fatal"]);
+
 	RemoveFromInsertList(idparts[1]);
 
 	return true;
 }
 
-const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
+const bool MessageInserter::HandlePutSuccessful(FCPv2::Message &message)
 {
 	MessageXML xml;
 	Poco::DateTime date;
@@ -147,7 +149,7 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid)
 		std::string xmlsizestr;
 		std::string privatekey;
 		std::string publickey;
-		FCPMessage message;
+		FCPv2::Message message;
 		std::string indexstr;
 		int index=0;
 		
@@ -206,8 +208,8 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid)
 		message["Identifier"]=m_fcpuniquename+"|"+messageuuid+"|"+idstr+"|"+indexstr+"|"+xmlfile.GetMessageID()+"|"+message["URI"];
 		message["UploadFrom"]="direct";
 		message["DataLength"]=xmlsizestr;
-		m_fcp->SendMessage(message);
-		m_fcp->SendRaw(xml.c_str(),xml.size());
+		m_fcp->Send(message);
+		m_fcp->Send(std::vector<char>(xml.begin(),xml.end()));
 
 		m_inserting.push_back(messageuuid);