X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistxml.cpp;h=d7321058168181a481253e9003d5f86180adbc1c;hb=befd91205eff729a182f66de15374a577a8718f7;hp=1b36aa3fe73a9f6d066fdf7f4f5e677d41caf23e;hpb=9048d8e482c91960265f29c2b5b3112f2a52f3d8;p=fms.git

diff --git a/src/freenet/trustlistxml.cpp b/src/freenet/trustlistxml.cpp
index 1b36aa3..d732105 100644
--- a/src/freenet/trustlistxml.cpp
+++ b/src/freenet/trustlistxml.cpp
@@ -1,6 +1,8 @@
 #include "../../include/freenet/trustlistxml.h"
 #include "../../include/stringfunctions.h"
 
+#include <algorithm>
+
 #ifdef XMEM
 	#include <xmem.h>
 #endif
@@ -71,8 +73,14 @@ std::string TrustListXML::GetXML()
 		TiXmlElement *tr=new TiXmlElement("Trust");
 		tid->LinkEndChild(tr);
 		tr->LinkEndChild(XMLCreateCDATAElement("Identity",(*i).m_identity));
-		tr->LinkEndChild(XMLCreateTextElement("MessageTrustLevel",messagetrust));
-		tr->LinkEndChild(XMLCreateTextElement("TrustListTrustLevel",trustlisttrust));
+		if((*i).m_messagetrust>=0)
+		{
+			tr->LinkEndChild(XMLCreateTextElement("MessageTrustLevel",messagetrust));
+		}
+		if((*i).m_trustlisttrust>=0)
+		{
+			tr->LinkEndChild(XMLCreateTextElement("TrustListTrustLevel",trustlisttrust));
+		}
 	}
 
 	td.Accept(&tp);
@@ -99,6 +107,7 @@ const bool TrustListXML::ParseXML(const std::string &xml)
 		TiXmlText *txt;
 		TiXmlHandle hnd(&td);
 		TiXmlNode *node;
+		std::vector<std::string> m_foundkeys;
 
 		Initialize();
 
@@ -119,22 +128,33 @@ const bool TrustListXML::ParseXML(const std::string &xml)
 			if(txt)
 			{
 				messagetruststr=txt->ValueStr();
-				StringFunctions::Convert(messagetruststr,messagetrust);
+				if(messagetruststr!="")
+				{
+					StringFunctions::Convert(messagetruststr,messagetrust);
+				}
 			}
 			txt=hnd2.FirstChild("TrustListTrustLevel").FirstChild().ToText();
 			if(txt)
 			{
 				trustlisttruststr=txt->ValueStr();
-				StringFunctions::Convert(trustlisttruststr,trustlisttrust);
+				if(trustlisttruststr!="")
+				{
+					StringFunctions::Convert(trustlisttruststr,trustlisttrust);
+				}
 			}
 
-			if(identity!="" && messagetrust>=0 && messagetrust<=100 && trustlisttrust>=0 && trustlisttrust<=100)
+			if(identity!="" && messagetrust>=-1 && messagetrust<=100 && trustlisttrust>=-1 && trustlisttrust<=100)
 			{
-				m_trust.push_back(trust(identity,messagetrust,trustlisttrust));
+				// check so we don't add the same identity multiple times from a trust list
+				if(std::find(m_foundkeys.begin(),m_foundkeys.end(),identity)==m_foundkeys.end())
+				{
+					m_foundkeys.push_back(identity);
+					m_trust.push_back(trust(identity,messagetrust,trustlisttrust));
+				}
 			}
 			else
 			{
-				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__," malformed Trust in TrustList.xml");
+				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"TrustListXML::ParseXML malformed Trust in TrustList.xml");
 			}
 			
 			node=node->NextSibling("Trust");