From 6714a37cfc67ead06ebdaf57bbf19af6e7aa607a Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Mon, 17 Jun 2019 08:14:05 +0300
Subject: [PATCH] Resolves #8 with WSASend
---
components/net/cpp/include/ftl/net/universe.hpp | 5 +++++
components/net/cpp/src/peer.cpp | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/components/net/cpp/include/ftl/net/universe.hpp b/components/net/cpp/include/ftl/net/universe.hpp
index db9e703dd..0c71db7fe 100644
--- a/components/net/cpp/include/ftl/net/universe.hpp
+++ b/components/net/cpp/include/ftl/net/universe.hpp
@@ -370,7 +370,12 @@ bool Universe::send(const ftl::UUID &pid, const std::string &name, ARGS... args)
DLOG(WARNING) << "Attempting to call an unknown peer : " << pid.to_string();
return false;
}
+#ifdef WIN32
+ return p->isConnected() && p->send(name, args...) >= 0;
+#else
return p->isConnected() && p->send(name, args...) > 0;
+#endif
+
}
/*template <typename... ARGS>
diff --git a/components/net/cpp/src/peer.cpp b/components/net/cpp/src/peer.cpp
index 967753b56..9b54887ac 100644
--- a/components/net/cpp/src/peer.cpp
+++ b/components/net/cpp/src/peer.cpp
@@ -602,9 +602,7 @@ int Peer::_send() {
}
DWORD bytessent;
- LOG(INFO) << "About to send: " << send_size;
int c = WSASend(sock_, wsabuf.data(), send_size, (LPDWORD)&bytessent, 0, NULL, NULL);
- LOG(INFO) << "Fin send";
#else
int c = ftl::net::internal::writev(sock_, send_buf_.vector(), (int)send_buf_.vector_size());
#endif
--
GitLab