Unverified Commit 83888e7d authored by kladko's avatar kladko

bug/SKALE-3662 Adding libzmq

parent 10d80482
...@@ -34,9 +34,17 @@ void ServerWorker::work() { ...@@ -34,9 +34,17 @@ void ServerWorker::work() {
zmq::message_t msg; zmq::message_t msg;
worker_.recv(&msg); worker_.recv(&msg);
vector <uint8_t> msgData(msg.size() + 1, 0); vector <uint8_t> msgData(msg.size() + 1, 0);
memcpy(msgData.data(), msg.data(), msg.size());
if (msg.size() < 5 || msgData.at(0) != '{' || msgData[msg.size()] != '}') {
cerr << "haha";
continue;
}
cerr << "Received:" << msgData.data(); cerr << "Received:" << msgData.data();
sleep(1);
auto parsedMsg = ZMQMessage::parse( auto parsedMsg = ZMQMessage::parse(
(const char*) msgData.data(), msg.size(), true); (const char*) msgData.data(), msg.size(), true);
......
...@@ -80,7 +80,7 @@ ZMQClient::ZMQClient(string &ip, uint16_t port) : ctx(1) { ...@@ -80,7 +80,7 @@ ZMQClient::ZMQClient(string &ip, uint16_t port) : ctx(1) {
void ZMQClient::reconnect() { void ZMQClient::reconnect() {
clientSocket = nullptr; // delete previous clientSocket = nullptr; // delete previous
clientSocket = make_unique<zmq::socket_t>(ctx, ZMQ_REQ); clientSocket = make_unique<zmq::socket_t>(ctx, ZMQ_DEALER);
clientSocket->connect(url); clientSocket->connect(url);
// Configure socket to not wait at close time // Configure socket to not wait at close time
int linger = 0; int linger = 0;
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "ZMQMessage.h" #include "ZMQMessage.h"
#define REQUEST_TIMEOUT 2500 // msecs, (> 1000!) #define REQUEST_TIMEOUT 10000 // msecs, (> 1000!)
class ZMQClient { class ZMQClient {
......
...@@ -52,7 +52,6 @@ shared_ptr <ZMQMessage> ZMQMessage::parse(const char* _msg, ...@@ -52,7 +52,6 @@ shared_ptr <ZMQMessage> ZMQMessage::parse(const char* _msg,
size_t _size, bool _isRequest) { size_t _size, bool _isRequest) {
cerr << "Server got:" << _msg << endl;
CHECK_STATE(_msg); CHECK_STATE(_msg);
CHECK_STATE(_size > 5); CHECK_STATE(_size > 5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment