generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-03-01 10:57:59 +01:00
Code Issues Projects Releases Wiki Activity

Problem: client/server socket types not defined.

Browse Source 
Solution: Add ZMQ_CLIENT and ZMQ_SERVER to socket_type enum.
Update some of draft guarded unit tests to use them.
This commit is contained in:
Pawel Kurdybacha 2018-05-11 06:41:53 +01:00
parent 2aba0bb3ac
commit 33025bf0e6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/poller.cpp
View File

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

4
zmq.hpp
View File

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