projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.28
[fms.git]
/
src
/
freenet
/
messagelistrequester.cpp
diff --git
a/src/freenet/messagelistrequester.cpp
b/src/freenet/messagelistrequester.cpp
index
d8ed8aa
..
17aba0a
100644
(file)
--- a/
src/freenet/messagelistrequester.cpp
+++ b/
src/freenet/messagelistrequester.cpp
@@
-15,7
+15,7
@@
MessageListRequester::MessageListRequester()
Initialize();
\r
}
\r
\r
Initialize();
\r
}
\r
\r
-MessageListRequester::MessageListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
\r
+MessageListRequester::MessageListRequester(FCPv2
::Connection
*fcp):IIndexRequester<long>(fcp)
\r
{
\r
Initialize();
\r
}
\r
{
\r
Initialize();
\r
}
\r
@@
-97,7
+97,7
@@
void MessageListRequester::GetBoardList(std::map<std::string,bool> &boards)
}
\r
}
\r
\r
}
\r
}
\r
\r
-const bool MessageListRequester::HandleAllData(FCPMessage &message)
\r
+const bool MessageListRequester::HandleAllData(FCP
v2::
Message &message)
\r
{
\r
SQLite3DB::Statement st;
\r
SQLite3DB::Statement trustst;
\r
{
\r
SQLite3DB::Statement st;
\r
SQLite3DB::Statement trustst;
\r
@@
-121,23
+121,16
@@
const bool MessageListRequester::HandleAllData(FCPMessage &message)
StringFunctions::Convert(idparts[2],index);
\r
\r
// wait for all data to be received from connection
\r
StringFunctions::Convert(idparts[2],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
\r
// if we got disconnected- return immediately
\r
- if(m_fcp->Connected()==false)
\r
+ if(m_fcp->
Is
Connected()==false)
\r
{
\r
return false;
\r
}
\r
\r
// receive the file
\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
// parse file into xml and update the database
\r
if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)
\r
\r
// parse file into xml and update the database
\r
if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)
\r
@@
-300,7
+293,7
@@
const bool MessageListRequester::HandleAllData(FCPMessage &message)
\r
}
\r
\r
\r
}
\r
\r
-const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
\r
+const bool MessageListRequester::HandleGetFailed(FCP
v2::
Message &message)
\r
{
\r
SQLite3DB::Statement st;
\r
std::vector<std::string> idparts;
\r
{
\r
SQLite3DB::Statement st;
\r
std::vector<std::string> idparts;
\r
@@
-416,13
+409,13
@@
void MessageListRequester::PopulateIDList()
}
\r
}
\r
\r
}
\r
}
\r
\r
-void MessageListRequester::StartRedirectRequest(FCPMessage &message)
\r
+void MessageListRequester::StartRedirectRequest(FCP
v2::
Message &message)
\r
{
\r
std::vector<std::string> parts;
\r
std::string indexstr="";
\r
std::string identityidstr="";
\r
std::string datestr="";
\r
{
\r
std::vector<std::string> parts;
\r
std::string indexstr="";
\r
std::string identityidstr="";
\r
std::string datestr="";
\r
- FCPMessage newmessage;
\r
+ FCP
v2::
Message newmessage;
\r
\r
// get the new edition #
\r
StringFunctions::Split(message["RedirectURI"],"/",parts);
\r
\r
// get the new edition #
\r
StringFunctions::Split(message["RedirectURI"],"/",parts);
\r
@@
-450,14
+443,14
@@
void MessageListRequester::StartRedirectRequest(FCPMessage &message)
newmessage["ReturnType"]="direct";
\r
newmessage["MaxSize"]="1000000";
\r
\r
newmessage["ReturnType"]="direct";
\r
newmessage["MaxSize"]="1000000";
\r
\r
- m_fcp->Send
Message
(newmessage);
\r
+ m_fcp->Send(newmessage);
\r
\r
}
\r
\r
void MessageListRequester::StartRequest(const long &id)
\r
{
\r
Poco::DateTime now;
\r
\r
}
\r
\r
void MessageListRequester::StartRequest(const long &id)
\r
{
\r
Poco::DateTime now;
\r
- FCPMessage message;
\r
+ FCP
v2::
Message message;
\r
std::string publickey;
\r
int index=0;
\r
std::string indexstr;
\r
std::string publickey;
\r
int index=0;
\r
std::string indexstr;
\r
@@
-500,7
+493,7
@@
void MessageListRequester::StartRequest(const long &id)
message["ReturnType"]="direct";
\r
message["MaxSize"]="1000000";
\r
\r
message["ReturnType"]="direct";
\r
message["MaxSize"]="1000000";
\r
\r
- m_fcp->Send
Message
(message);
\r
+ m_fcp->Send(message);
\r
\r
m_requesting.push_back(id);
\r
}
\r
\r
m_requesting.push_back(id);
\r
}
\r