X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=01db50c6b72006babdc13aecfd8d7a24b11f0808;hb=c0ebc7b53a977885ebc2d3a679c586ae20c0bc4a;hp=b957c50087e2867c33efa3e678a528939c6a687a;hpb=cd75427de26fc2ebc9baad558b1c0a081faa3b43;p=fms.git

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index b957c50..01db50c 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -34,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;
@@ -123,6 +123,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 	if(m_receivednodehello==true)
 	{
 		bool handled=false;
+
 		std::vector<IFCPMessageHandler *>::iterator i=m_fcpmessagehandlers.begin();
 		while(handled==false && i!=m_fcpmessagehandlers.end())
 		{