mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-27 00:19:25 -05:00
added missing call to SSL_pending, which caused decrypted data to wait in the SSL buffer when the bio is not receiving anything more
This commit is contained in:
parent
a4430647de
commit
654e0fc1d8
@ -1857,7 +1857,11 @@ bool pqissl::moretoread(uint32_t usec)
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
else if(SSL_pending(ssl_connection) > 0)
|
||||
{
|
||||
return 1 ;
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef PQISSL_DEBUG
|
||||
rslog(RSL_DEBUG_ALL, pqisslzone,
|
||||
|
@ -63,6 +63,7 @@ static uint8_t PACKET_SLICING_PROBE_BYTES[8] = { 0x02, 0xaa, 0xbb, 0xcc, 0x00,
|
||||
#define DEBUG_PQISTREAMER 1
|
||||
#define DEBUG_PACKET_SLICING 1
|
||||
***/
|
||||
#define DEBUG_PACKET_SLICING 1
|
||||
|
||||
#ifdef DEBUG_TRANSFERS
|
||||
#include "util/rsprint.h"
|
||||
@ -780,6 +781,8 @@ continue_packet:
|
||||
std::cerr << "Reading partial packet from mem block " << RsUtil::BinToHex((char*)block,8) << ": packet_id=" << std::hex << slice_packet_id << std::dec << ", len=" << extralen << std::endl;
|
||||
#endif
|
||||
is_partial_packet = true ;
|
||||
|
||||
mAcceptsPacketSlicing = true ; // this is needed
|
||||
}
|
||||
else
|
||||
extralen = getRsItemSize(block) - blen; // old style packet type
|
||||
|
@ -47,7 +47,6 @@ int rsserverzone = 101;
|
||||
/****
|
||||
#define DEBUG_TICK 1
|
||||
****/
|
||||
#define DEBUG_TICK 1
|
||||
|
||||
#define WARN_BIG_CYCLE_TIME (0.2)
|
||||
#ifdef WINDOWS_SYS
|
||||
@ -140,8 +139,6 @@ void RsServer::data_tick()
|
||||
double ts = getCurrentTS();
|
||||
double delta = ts - mLastts;
|
||||
|
||||
std::cerr << "[data tick] delta = " << delta << std::endl;
|
||||
|
||||
/* for the fast ticked stuff */
|
||||
if (delta > mTimeDelta)
|
||||
{
|
||||
|
@ -150,7 +150,6 @@ RsServiceInfo p3rtt::getServiceInfo()
|
||||
|
||||
int p3rtt::tick()
|
||||
{
|
||||
std::cerr << "p3rtt::tick() " << getCurrentTS() << std::endl;
|
||||
sendPackets();
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user