version 0.3.28

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

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index c0feb6a..4890339 100644 (file)
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -95,7 +95,7 @@ const bool FreenetMasterThread::FCPConnect()
 \r
                std::string clientname="FMSClient-"+uuid.toString();\r
                // send ClientHello message to node\r
-               m_fcp.SendMessage("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0");\r
+               m_fcp.Send(FCPv2::Message("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0"));\r
 \r
                m_log->information("FreenetMasterThread::FCPConnect connected to node");\r
 \r
@@ -108,7 +108,7 @@ const bool FreenetMasterThread::FCPConnect()
 \r
 }\r
 \r
-const bool FreenetMasterThread::HandleMessage(FCPMessage &message)\r
+const bool FreenetMasterThread::HandleMessage(FCPv2::Message &message)\r
 {\r
        if(message.GetName()=="NodeHello")\r
        {\r
@@ -136,7 +136,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
                if(handled==false)\r
                {\r
                        std::string info("");\r
-                       for(std::map<std::string,std::string>::iterator mi=message.begin(); mi!=message.end(); mi++)\r
+                       for(std::map<std::string,std::string>::iterator mi=message.GetFields().begin(); mi!=message.GetFields().end(); mi++)\r
                        {\r
                                info+="\t\t\t\t"+(*mi).first+"="+(*mi).second+"\r\n";\r
                        }\r
@@ -147,15 +147,11 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
                        {\r
                                long length;\r
                                StringFunctions::Convert(message["DataLength"],length);\r
-                               while(m_fcp.Connected() && m_fcp.ReceiveBufferSize()<length)\r
-                               {\r
-                                       m_fcp.Update(1);\r
-                               }\r
-                               if(m_fcp.Connected() && length>0)\r
+                               m_fcp.WaitForBytes(1000,length);\r
+\r
+                               if(m_fcp.IsConnected() && length>0)\r
                                {\r
-                                       char *data=new char[length];\r
-                                       m_fcp.ReceiveRaw(data,length);\r
-                                       delete [] data;\r
+                                       m_fcp.ReceiveIgnore(length);\r
                                }\r
                        }\r
                }\r
@@ -192,7 +188,7 @@ void FreenetMasterThread::run()
        Poco::DateTime lastreceivedmessage;\r
        Poco::DateTime lastconnected;\r
        Poco::DateTime now;\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        bool done=false;\r
 \r
        lastconnected-=Poco::Timespan(0,0,1,0,0);\r
@@ -205,7 +201,7 @@ void FreenetMasterThread::run()
        {\r
                try\r
                {\r
-                       if(m_fcp.Connected()==false)\r
+                       if(m_fcp.IsConnected()==false)\r
                        {\r
                                // wait at least 1 minute since last successful connect\r
                                now=Poco::Timestamp();\r
@@ -235,13 +231,13 @@ void FreenetMasterThread::run()
                        // fcp is connected\r
                        else\r
                        {\r
-                               m_fcp.Update(1);\r
+                               m_fcp.Update(1000);\r
 \r
                                // check for message on receive buffer and handle it\r
-                               if(m_fcp.ReceiveBufferSize()>0)\r
+                               if(m_fcp.MessageReady()==true)\r
                                {\r
-                                       message.Reset();\r
-                                       message=m_fcp.ReceiveMessage();\r
+                                       message.Clear();\r
+                                       m_fcp.Receive(message);\r
 \r
                                        if(message.GetName()!="")\r
                                        {\r
@@ -264,7 +260,7 @@ void FreenetMasterThread::run()
                                        m_fcp.Disconnect();\r
                                }\r
 \r
-                               if(m_fcp.Connected()==false)\r
+                               if(m_fcp.IsConnected()==false)\r
                                {\r
                                        m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\r
                                }\r