X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=c23ee2719c4c5cf4ca3c3874b6e3984337f3024f;hb=278ee758050cb7772cd95946688c5b40104f4d8b;hp=9e0670cc77448b543fe05af5429f9dd72fec91de;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 9e0670c..c23ee27 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -18,6 +18,7 @@
 #include "../../include/freenet/boardlistrequester.h"
 #include "../../include/freenet/siteinserter.h"
 #include "../../include/freenet/fileinserter.h"
+#include "../../include/freenet/fmsversionrequester.h"
 
 #include <Poco/UUID.h>
 #include <Poco/UUIDGenerator.h>
@@ -33,24 +34,24 @@
 
 FreenetMasterThread::FreenetMasterThread()
 {
-	std::string fcpport;
 
 	if(Option::Instance()->Get("FCPHost",m_fcphost)==false)
 	{
 		m_fcphost="localhost";
 		Option::Instance()->Set("FCPHost",m_fcphost);
 	}
-	if(Option::Instance()->Get("FCPPort",fcpport)==false)
+	if(Option::Instance()->GetInt("FCPPort",m_fcpport)==false)
 	{
-		fcpport="9481";
-		Option::Instance()->Set("FCPPort",fcpport);
+		m_fcpport=9481;
+		Option::Instance()->Set("FCPPort",m_fcpport);
 	}
-
-	// convert fcp port to long, and make sure it's within the valid port range
-	if(StringFunctions::Convert(fcpport,m_fcpport)==false)
+	else
 	{
-		m_fcpport=9481;
-		Option::Instance()->Set("FCPPort","9481");
+		if(m_fcpport<1 || m_fcpport>65535)
+		{
+			m_fcpport=9481;
+			Option::Instance()->Set("FCPPort",m_fcpport);
+		}
 	}
 
 	m_receivednodehello=false;
@@ -199,70 +200,81 @@ void FreenetMasterThread::run()
 
 	do
 	{
-		if(m_fcp.Connected()==false)
+		try
 		{
-			// wait at least 1 minute since last successful connect
-			now=Poco::Timestamp();
-			if(lastconnected<=(now-Poco::Timespan(0,0,1,0,0)))
+			if(m_fcp.Connected()==false)
 			{
-				if(FCPConnect()==false)
+				// wait at least 1 minute since last successful connect
+				now=Poco::Timestamp();
+				if(lastconnected<=(now-Poco::Timespan(0,0,1,0,0)))
 				{
+					if(FCPConnect()==false)
+					{
 
-					m_log->error("FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");
+						m_log->error("FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");
 
-					for(int i=0; i<60 && !IsCancelled(); i++)
+						for(int i=0; i<60 && !IsCancelled(); i++)
+						{
+							Poco::Thread::sleep(1000);
+						}
+					}
+					else
 					{
-						Poco::Thread::sleep(1000);
+						lastreceivedmessage=Poco::Timestamp();
+						lastconnected=Poco::Timestamp();
 					}
 				}
 				else
 				{
-					lastreceivedmessage=Poco::Timestamp();
-					lastconnected=Poco::Timestamp();
+					Poco::Thread::sleep(1000);
 				}
 			}
+			// fcp is connected
 			else
 			{
-				Poco::Thread::sleep(1000);
-			}
-		}
-		// fcp is connected
-		else
-		{
-			m_fcp.Update(1);
+				m_fcp.Update(1);
 
-			// check for message on receive buffer and handle it
-			if(m_fcp.ReceiveBufferSize()>0)
-			{
-				message.Reset();
-				message=m_fcp.ReceiveMessage();
+				// check for message on receive buffer and handle it
+				if(m_fcp.ReceiveBufferSize()>0)
+				{
+					message.Reset();
+					message=m_fcp.ReceiveMessage();
+
+					if(message.GetName()!="")
+					{
+						HandleMessage(message);
+						lastreceivedmessage=Poco::Timestamp();
+					}
+				}
 
-				if(message.GetName()!="")
+				// let objects do their processing
+				for(std::vector<IPeriodicProcessor *>::iterator i=m_processors.begin(); i!=m_processors.end(); i++)
 				{
-					HandleMessage(message);
-					lastreceivedmessage=Poco::Timestamp();
+					(*i)->Process();
 				}
-			}
 
-			// let objects do their processing
-			for(std::vector<IPeriodicProcessor *>::iterator i=m_processors.begin(); i!=m_processors.end(); i++)
-			{
-				(*i)->Process();
-			}
+				// if we haven't received any messages from the node in 10 minutes, something is wrong
+				now=Poco::Timestamp();
+				if(lastreceivedmessage<(now-Poco::Timespan(0,0,10,0,0)))
+				{
+					m_log->error("FreenetMasterThread::Run The Freenet node has not responded in 10 minutes.  Trying to reconnect.");
+					m_fcp.Disconnect();
+				}
 
-			// if we haven't received any messages from the node in 10 minutes, something is wrong
-			now=Poco::Timestamp();
-			if(lastreceivedmessage<(now-Poco::Timespan(0,0,10,0,0)))
-			{
-				m_log->error("FreenetMasterThread::Run The Freenet node has not responded in 10 minutes.  Trying to reconnect.");
-				m_fcp.Disconnect();
-			}
+				if(m_fcp.Connected()==false)
+				{
+					m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");
+				}
 
-			if(m_fcp.Connected()==false)
-			{
-				m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");
 			}
-
+		}
+		catch(Poco::Exception &e)
+		{
+			m_log->error("FreenetMasterThread::run caught exception : "+e.displayText());
+		}
+		catch(...)
+		{
+			m_log->error("FreenetMasterThread::run caught unknown exception");
 		}
 	}while(!IsCancelled() && done==false);
 
@@ -297,6 +309,7 @@ void FreenetMasterThread::Setup()
 	m_registrables.push_back(new BoardListRequester(&m_fcp));
 	m_registrables.push_back(new SiteInserter(&m_fcp));
 	m_registrables.push_back(new FileInserter(&m_fcp));
+	m_registrables.push_back(new FMSVersionRequester(&m_fcp));
 
 	for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
 	{