version 0.3.21

[fms.git] / src / freenet / freenetmasterthread.cpp

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index b957c50..62b84ed 100644 (file)
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -34,24 +34,24 @@
 \r
 FreenetMasterThread::FreenetMasterThread()\r
 {\r
-       std::string fcpport;\r
 \r
        if(Option::Instance()->Get("FCPHost",m_fcphost)==false)\r
        {\r
                m_fcphost="localhost";\r
                Option::Instance()->Set("FCPHost",m_fcphost);\r
        }\r
-       if(Option::Instance()->Get("FCPPort",fcpport)==false)\r
+       if(Option::Instance()->GetInt("FCPPort",m_fcpport)==false)\r
        {\r
-               fcpport="9481";\r
-               Option::Instance()->Set("FCPPort",fcpport);\r
+               m_fcpport=9481;\r
+               Option::Instance()->Set("FCPPort",m_fcpport);\r
        }\r
-\r
-       // convert fcp port to long, and make sure it's within the valid port range\r
-       if(StringFunctions::Convert(fcpport,m_fcpport)==false)\r
+       else\r
        {\r
-               m_fcpport=9481;\r
-               Option::Instance()->Set("FCPPort","9481");\r
+               if(m_fcpport<1 || m_fcpport>65535)\r
+               {\r
+                       m_fcpport=9481;\r
+                       Option::Instance()->Set("FCPPort",m_fcpport);\r
+               }\r
        }\r
 \r
        m_receivednodehello=false;\r
@@ -123,6 +123,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
        if(m_receivednodehello==true)\r
        {\r
                bool handled=false;\r
+\r
                std::vector<IFCPMessageHandler *>::iterator i=m_fcpmessagehandlers.begin();\r
                while(handled==false && i!=m_fcpmessagehandlers.end())\r
                {\r
@@ -148,7 +149,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
                                {\r
                                        m_fcp.Update(1);\r
                                }\r
-                               if(m_fcp.Connected())\r
+                               if(m_fcp.Connected() && length>0)\r
                                {\r
                                        char *data=new char[length];\r
                                        m_fcp.ReceiveRaw(data,length);\r