Browse Source

corrections

cl-refactor
subtly 9 years ago
parent
commit
3cc6f40dcb
  1. 1
      libp2p/RLPXFrameWriter.cpp
  2. 4
      libp2p/RLPXSocketIO.cpp

1
libp2p/RLPXFrameWriter.cpp

@ -121,7 +121,6 @@ size_t RLPXFrameWriter::drain(RLPXFrameCoder& _coder, unsigned _size, vector<byt
if (!qs.remaining) if (!qs.remaining)
{ {
qs.writing = nullptr; qs.writing = nullptr;
qs.remaining = 0;
qs.sequenced = false; qs.sequenced = false;
DEV_GUARDED(qs.x) DEV_GUARDED(qs.x)
qs.q.pop_front(); qs.q.pop_front();

4
libp2p/RLPXSocketIO.cpp

@ -26,7 +26,7 @@ using namespace std;
using namespace dev; using namespace dev;
using namespace dev::p2p; using namespace dev::p2p;
uint32_t const RLPXSocketIO::MinFrameSize = /*header*/h128::size + /*type*/1 + /*mac*/h128::size; uint32_t const RLPXSocketIO::MinFrameSize = h128::size * 3; // header + block + mac
uint32_t const RLPXSocketIO::MaxPacketSize = 1 << 24; uint32_t const RLPXSocketIO::MaxPacketSize = 1 << 24;
uint16_t const RLPXSocketIO::DefaultInitialCapacity = 8 << 8; uint16_t const RLPXSocketIO::DefaultInitialCapacity = 8 << 8;
@ -72,7 +72,7 @@ void RLPXSocketIO::doWrite()
active += 1; active += 1;
size_t dequed = 0; size_t dequed = 0;
size_t protFrameSize = capacity / active; size_t protFrameSize = capacity / active;
if (protFrameSize >= MinFrameSize * active) if (protFrameSize >= MinFrameSize)
for (auto& w: m_writers) for (auto& w: m_writers)
dequed += w.drain(m_coder, protFrameSize, m_toSend); dequed += w.drain(m_coder, protFrameSize, m_toSend);

Loading…
Cancel
Save