From 2c4eff810dab9e5a4965d3f192ba2229c5a22db3 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 14 Jun 2019 06:57:24 +0300
Subject: [PATCH] Correction to recv buffer size
---
components/net/cpp/src/peer.cpp | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/components/net/cpp/src/peer.cpp b/components/net/cpp/src/peer.cpp
index 678046d1a..52e082373 100644
--- a/components/net/cpp/src/peer.cpp
+++ b/components/net/cpp/src/peer.cpp
@@ -113,6 +113,7 @@ static SOCKET tcpConnect(URI &uri) {
if (rc < 0) {
if (errno == EINPROGRESS) {
+ // TODO(Nick) Move to main select thread to prevent blocking
fd_set myset;
struct timeval tv;
tv.tv_sec = 1;
@@ -398,7 +399,7 @@ void Peer::data() {
return;
}
- int rc = ftl::net::internal::recv(sock_, recv_buf_.buffer(), kMaxMessage, 0);
+ int rc = ftl::net::internal::recv(sock_, recv_buf_.buffer(), recv_buf_.buffer_capacity(), 0);
if (rc <= 0) {
return;
@@ -413,16 +414,6 @@ void Peer::data() {
}, this);
}
-/*inline std::ostream& hex_dump(std::ostream& o, std::string const& v) {
- std::ios::fmtflags f(o.flags());
- o << std::hex;
- for (auto c : v) {
- o << "0x" << std::setw(2) << std::setfill('0') << (static_cast<int>(c) & 0xff) << ' ';
- }
- o.flags(f);
- return o;
-}*/
-
bool Peer::_data() {
std::unique_lock<std::recursive_mutex> lk(recv_mtx_);
@@ -443,11 +434,6 @@ bool Peer::_data() {
ws_read_header_ = true;
}
- /*if (rc > 0) {
- hex_dump(std::cout, std::string((char*)recv_buf_.nonparsed_buffer(), recv_buf_.nonparsed_size()));
- std::cout << std::endl;
- }*/
-
msgpack::object_handle msg;
while (recv_buf_.next(msg)) {
ws_read_header_ = false;
--
GitLab