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
/
fmsversionrequester.cpp
diff --git
a/src/freenet/fmsversionrequester.cpp
b/src/freenet/fmsversionrequester.cpp
index
7632998
..
39fb027
100644
(file)
--- a/
src/freenet/fmsversionrequester.cpp
+++ b/
src/freenet/fmsversionrequester.cpp
@@
-11,12
+11,12
@@
FMSVersionRequester::FMSVersionRequester()
Initialize();
\r
}
\r
\r
Initialize();
\r
}
\r
\r
-FMSVersionRequester::FMSVersionRequester(FCPv2 *fcp):IFCPConnected(fcp)
\r
+FMSVersionRequester::FMSVersionRequester(FCPv2
::Connection
*fcp):IFCPConnected(fcp)
\r
{
\r
Initialize();
\r
}
\r
\r
{
\r
Initialize();
\r
}
\r
\r
-const bool FMSVersionRequester::HandleAllData(FCPMessage &message)
\r
+const bool FMSVersionRequester::HandleAllData(FCP
v2::
Message &message)
\r
{
\r
std::vector<char> data;
\r
long datalength;
\r
{
\r
std::vector<char> data;
\r
long datalength;
\r
@@
-25,23
+25,16
@@
const bool FMSVersionRequester::HandleAllData(FCPMessage &message)
StringFunctions::Convert(message["DataLength"],datalength);
\r
\r
// wait for all data to be received from connection
\r
StringFunctions::Convert(message["DataLength"],datalength);
\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
// update latest edition #
\r
std::vector<std::string> parts;
\r
\r
// update latest edition #
\r
std::vector<std::string> parts;
\r
@@
-76,7
+69,7
@@
const bool FMSVersionRequester::HandleAllData(FCPMessage &message)
return true;
\r
}
\r
\r
return true;
\r
}
\r
\r
-const bool FMSVersionRequester::HandleGetFailed(FCPMessage &message)
\r
+const bool FMSVersionRequester::HandleGetFailed(FCP
v2::
Message &message)
\r
{
\r
std::vector<std::string> parts;
\r
StringFunctions::Split(message["Identifier"],"/",parts);
\r
{
\r
std::vector<std::string> parts;
\r
StringFunctions::Split(message["Identifier"],"/",parts);
\r
@@
-95,7
+88,7
@@
const bool FMSVersionRequester::HandleGetFailed(FCPMessage &message)
return true;
\r
}
\r
\r
return true;
\r
}
\r
\r
-const bool FMSVersionRequester::HandleMessage(FCPMessage &message)
\r
+const bool FMSVersionRequester::HandleMessage(FCP
v2::
Message &message)
\r
{
\r
if(message["Identifier"].find(m_fcpuniquename)==0)
\r
{
\r
{
\r
if(message["Identifier"].find(m_fcpuniquename)==0)
\r
{
\r
@@
-154,7
+147,7
@@
void FMSVersionRequester::RegisterWithThread(FreenetMasterThread *thread)
\r
void FMSVersionRequester::StartRequest()
\r
{
\r
\r
void FMSVersionRequester::StartRequest()
\r
{
\r
- FCPMessage message;
\r
+ FCP
v2::
Message message;
\r
std::string key="";
\r
std::string editionstr="0";
\r
int edition=0;
\r
std::string key="";
\r
std::string editionstr="0";
\r
int edition=0;
\r
@@
-174,6
+167,6
@@
void FMSVersionRequester::StartRequest()
message["ReturnType"]="direct";
\r
message["MaxSize"]="30000"; // 30K
\r
\r
message["ReturnType"]="direct";
\r
message["MaxSize"]="30000"; // 30K
\r
\r
- m_fcp->Send
Message
(message);
\r
+ m_fcp->Send(message);
\r
\r
}
\r
\r
}
\r