Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-20 21:34:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

found and corrected this bug about wrong packet size. This took me the WE, but I have a great deal of patience ;-)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-02-15 20:13:35 +00:00
parent b0668b1f48
commit f98c8153a6
1 changed files with 95 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libretroshare/src/pqi/pqissl.cc
View File

@ -1396,16 +1396,12 @@ int pqissl::senddata(void *data, int len)
int pqissl::readdata(void *data, int len) int pqissl::readdata(void *data, int len)
{ {
int tmppktlen = SSL_read(ssl_connection, data, len); int total_len = 0 ;
if (len != tmppktlen) do
{ {
std::ostringstream out; int tmppktlen = SSL_read(ssl_connection, (void*)((unsigned long int)data+(unsigned long int)total_len), len-total_len);
out << "pqissl::readdata()";
out << " Full Packet Not read!" << std::endl; std::cerr <<"pqissl: read " << tmppktlen+total_len << " bytes. expected " << len << ", still " << len-(tmppktlen+total_len) << " to read"<< std::endl ;
out << " -> Expected len(" << len << ") actually read(";
out << tmppktlen << ")" << std::endl;
rslog(RSL_WARNING, pqisslzone, out.str());
}
// need to catch errors..... // need to catch errors.....
if (tmppktlen <= 0) // probably needs a reset. if (tmppktlen <= 0) // probably needs a reset.
{ {
@ -1487,8 +1483,22 @@ int pqissl::readdata(void *data, int len)
rslog(RSL_ALERT, pqisslzone, out.str()); rslog(RSL_ALERT, pqisslzone, out.str());
//exit(1); //exit(1);
} }
else
total_len+=tmppktlen ;
} while(total_len < len) ;
if (len != total_len)
{
std::ostringstream out;
out << "pqissl::readdata()";
out << " Full Packet Not read!" << std::endl;
out << " -> Expected len(" << len << ") actually read(";
out << total_len << ")" << std::endl;
std::cerr << out.str() ;
rslog(RSL_WARNING, pqisslzone, out.str());
}
n_read_zero = 0; n_read_zero = 0;
return tmppktlen; return len;//tmppktlen;
} }