version 0.3.29

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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index c5361ec..f1429ab 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -11,12 +11,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-MessageRequester::MessageRequester()\r
+MessageRequester::MessageRequester(SQLite3DB::DB *db):IIndexRequester<std::string>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)\r
+MessageRequester::MessageRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<std::string>(db,fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -85,7 +85,7 @@ const std::string MessageRequester::GetIdentityName(const long identityid)
        }\r
 }\r
 \r
-const bool MessageRequester::HandleAllData(FCPMessage &message)\r
+const bool MessageRequester::HandleAllData(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -104,23 +104,16 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
        StringFunctions::Convert(idparts[4],index);\r
 \r
        // wait for all data to be received from connection\r
-       while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)\r
-       {\r
-               m_fcp->Update(1);\r
-       }\r
+       m_fcp->WaitForBytes(1000,datalength);\r
 \r
        // if we got disconnected- return immediately\r
-       if(m_fcp->Connected()==false)\r
+       if(m_fcp->IsConnected()==false)\r
        {\r
                return false;\r
        }\r
 \r
        // receive the file\r
-       data.resize(datalength);\r
-       if(data.size()>0)\r
-       {\r
-               m_fcp->ReceiveRaw(&data[0],datalength);\r
-       }\r
+       m_fcp->Receive(data,datalength);\r
 \r
        // mark this index as received\r
        st=m_db->Prepare("UPDATE tblMessageRequests SET Found='true' WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
@@ -231,6 +224,8 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
                                nntpbody+="\r\n";\r
                        }\r
 \r
+                       m_db->Execute("BEGIN;");\r
+\r
                        st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex) VALUES(?,?,?,?,?,?,?,?,?);");\r
                        st.Bind(0,identityid);\r
                        st.Bind(1,GetIdentityName(identityid));\r
@@ -279,6 +274,8 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
                                //m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database.  "+message["Identifier"]);\r
                        }\r
 \r
+                       m_db->Execute("COMMIT;");\r
+\r
                }       // if validmessage\r
        }\r
        else\r
@@ -291,7 +288,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
        return true;\r
 }\r
 \r
-const bool MessageRequester::HandleGetFailed(FCPMessage &message)\r
+const bool MessageRequester::HandleGetFailed(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -326,10 +323,11 @@ const bool MessageRequester::HandleGetFailed(FCPMessage &message)
 void MessageRequester::Initialize()\r
 {\r
        m_fcpuniquename="MessageRequester";\r
-       std::string tempval;\r
-\r
+       std::string tempval("");\r
        m_maxrequests=0;\r
-       Option::Instance()->GetInt("MaxMessageRequests",m_maxrequests);\r
+       Option option(m_db);\r
+\r
+       option.GetInt("MaxMessageRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r
@@ -341,7 +339,7 @@ void MessageRequester::Initialize()
        }\r
 \r
        m_maxdaysbackward=0;\r
-       Option::Instance()->GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);\r
+       option.GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);\r
        if(m_maxdaysbackward<0)\r
        {\r
                m_maxdaysbackward=0;\r
@@ -353,7 +351,7 @@ void MessageRequester::Initialize()
        }\r
 \r
        m_maxpeermessages=0;\r
-       Option::Instance()->GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);\r
+       option.GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);\r
        if(m_maxpeermessages<1)\r
        {\r
                m_maxpeermessages=1;\r
@@ -365,7 +363,7 @@ void MessageRequester::Initialize()
        }\r
 \r
        m_maxboardspermessage=0;\r
-       Option::Instance()->GetInt("MaxBoardsPerMessage",m_maxboardspermessage);\r
+       option.GetInt("MaxBoardsPerMessage",m_maxboardspermessage);\r
        if(m_maxboardspermessage<1)\r
        {\r
                m_maxboardspermessage=1;\r
@@ -376,7 +374,7 @@ void MessageRequester::Initialize()
                m_log->warning("Option MaxBoardsPerMessage is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
 \r
-       Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+       option.Get("SaveMessagesFromNewBoards",tempval);\r
        if(tempval=="true")\r
        {\r
                m_savemessagesfromnewboards=true;\r
@@ -386,7 +384,7 @@ void MessageRequester::Initialize()
                m_savemessagesfromnewboards=false;\r
        }\r
 \r
-       Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+       option.Get("LocalTrustOverridesPeerTrust",tempval);\r
        if(tempval=="true")\r
        {\r
                m_localtrustoverrides=true;\r
@@ -479,7 +477,7 @@ const bool MessageRequester::SaveToBoard(const std::string &boardname)
 \r
 void MessageRequester::StartRequest(const std::string &requestid)\r
 {\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        std::vector<std::string> parts;\r
        std::string tempval;\r
        long identityid;\r
@@ -507,7 +505,7 @@ void MessageRequester::StartRequest(const std::string &requestid)
                message["MaxSize"]="1000000";           // 1 MB\r
                message["MaxRetries"]="-1";                     // use ULPR since we are fairly sure message exists since the author says it does\r
 \r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
 \r
                m_requesting.push_back(requestid);\r
 \r