X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Ffreenet%2Fiindexrequester.h;h=61738687daaa69cb1d20521ce9c996461a2b71c8;hb=221236a4d3aac4144529d418ce368db5c98facb0;hp=b74e69a5a418da5318217111ce8820b89a07629f;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/include/freenet/iindexrequester.h b/include/freenet/iindexrequester.h
index b74e69a..6173868 100644
--- a/include/freenet/iindexrequester.h
+++ b/include/freenet/iindexrequester.h
@@ -14,6 +14,8 @@
 #include <Poco/Timestamp.h>
 #include <Poco/Timespan.h>
 
+#include <algorithm>
+
 #ifdef XMEM
 	#include <xmem.h>
 #endif
@@ -51,7 +53,7 @@ protected:
 	std::vector<IDTYPE> m_requesting;		// list of ids we are currently requesting from
 
 	// these MUST be populated by child class
-	long m_maxrequests;
+	int m_maxrequests;
 	std::string m_fcpuniquename;
 
 };
@@ -82,7 +84,7 @@ void IIndexRequester<IDTYPE>::FCPConnected()
 	}
 	if(m_fcpuniquename.find("|")!=std::string::npos)
 	{
-		m_log->fatal("IIndexRequester<IDTYPE>::FCPConnected fcpuniquename contains | character!  This is not a valid character!");
+		m_log->fatal("IIndexRequester<IDTYPE>::FCPConnected fcpuniquename "+m_fcpuniquename+" contains | character!  This is not a valid character!");
 	}
 
 	m_lastreceived=Poco::Timestamp();
@@ -208,11 +210,16 @@ void IIndexRequester<IDTYPE>::RegisterWithThread(FreenetMasterThread *thread)
 template <class IDTYPE>
 void IIndexRequester<IDTYPE>::RemoveFromRequestList(const IDTYPE id)
 {
+/*
 	typename std::vector<IDTYPE>::iterator i=m_requesting.begin();
 	while(i!=m_requesting.end() && (*i)!=id)
 	{
 		i++;
 	}
+*/
+	// better
+	typename std::vector<IDTYPE>::iterator i=std::find(m_requesting.begin(),m_requesting.end(),id);
+
 	if(i!=m_requesting.end())
 	{
 		m_requesting.erase(i);