Merge pull request #223 from kurdybacha/server-client

Problem: client/server socket types not defined.
This commit is contained in:
Simon Giesecke 2018-05-11 08:11:30 +02:00 committed by GitHub
commit e972f39c93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -183,8 +183,8 @@ struct server_client_setup
};
zmq::context_t context;
zmq::socket_t server {context, zmq::socket_type::router};
zmq::socket_t client {context, zmq::socket_type::dealer};
zmq::socket_t server {context, zmq::socket_type::server};
zmq::socket_t client {context, zmq::socket_type::client};
std::string endpoint;
short events = 0;
};
@ -222,7 +222,6 @@ TEST(poller, client_server)
zmq::poller_t::handler_t handler = [&](short e) {
if (0 != (e & ZMQ_POLLIN)) {
zmq::message_t zmq_msg;
ASSERT_NO_THROW(s.server.recv(&zmq_msg)); // skip msg id
ASSERT_NO_THROW(s.server.recv(&zmq_msg)); // get message
std::string recv_msg(zmq_msg.data<char>(),
zmq_msg.size());

View File

@ -563,6 +563,10 @@ namespace zmq
xsub = ZMQ_XSUB,
push = ZMQ_PUSH,
pull = ZMQ_PULL,
#ifdef ZMQ_BUILD_DRAFT_API
server = ZMQ_SERVER,
client = ZMQ_CLIENT,
#endif
#if ZMQ_VERSION_MAJOR >= 4
stream = ZMQ_STREAM,
#endif