mirror of
https://github.com/zeromq/cppzmq.git
synced 2024-12-12 10:33:52 +01:00
Merge pull request #594 from mschubert/master
add DRAFT socket options for libzmq 4.3.2-4
This commit is contained in:
commit
2e6eff0dcc
21
zmq.hpp
21
zmq.hpp
@ -1482,6 +1482,9 @@ ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_CURVE_SERVER, curve_server, int);
|
|||||||
#ifdef ZMQ_CURVE_SERVERKEY
|
#ifdef ZMQ_CURVE_SERVERKEY
|
||||||
ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_SERVERKEY, curve_serverkey);
|
ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_SERVERKEY, curve_serverkey);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ZMQ_DISCONNECT_MSG
|
||||||
|
ZMQ_DEFINE_ARRAY_OPT_BINARY(ZMQ_DISCONNECT_MSG, disconnect_msg);
|
||||||
|
#endif
|
||||||
#ifdef ZMQ_EVENTS
|
#ifdef ZMQ_EVENTS
|
||||||
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_EVENTS, events, int);
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_EVENTS, events, int);
|
||||||
#endif
|
#endif
|
||||||
@ -1522,6 +1525,9 @@ ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_TIMEOUT, heartbeat_timeout, int);
|
|||||||
#ifdef ZMQ_HEARTBEAT_TTL
|
#ifdef ZMQ_HEARTBEAT_TTL
|
||||||
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_TTL, heartbeat_ttl, int);
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_TTL, heartbeat_ttl, int);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ZMQ_HELLO_MSG
|
||||||
|
ZMQ_DEFINE_ARRAY_OPT_BINARY(ZMQ_HELLO_MSG, hello_msg);
|
||||||
|
#endif
|
||||||
#ifdef ZMQ_IMMEDIATE
|
#ifdef ZMQ_IMMEDIATE
|
||||||
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_IMMEDIATE, immediate, int);
|
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_IMMEDIATE, immediate, int);
|
||||||
#endif
|
#endif
|
||||||
@ -1567,6 +1573,9 @@ ZMQ_DEFINE_ARRAY_OPT(ZMQ_PLAIN_PASSWORD, plain_password);
|
|||||||
#ifdef ZMQ_PLAIN_USERNAME
|
#ifdef ZMQ_PLAIN_USERNAME
|
||||||
ZMQ_DEFINE_ARRAY_OPT(ZMQ_PLAIN_USERNAME, plain_username);
|
ZMQ_DEFINE_ARRAY_OPT(ZMQ_PLAIN_USERNAME, plain_username);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ZMQ_PRIORITY
|
||||||
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_PRIORITY, priority, int);
|
||||||
|
#endif
|
||||||
#ifdef ZMQ_USE_FD
|
#ifdef ZMQ_USE_FD
|
||||||
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_USE_FD, use_fd, int);
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_USE_FD, use_fd, int);
|
||||||
#endif
|
#endif
|
||||||
@ -1594,6 +1603,9 @@ ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_IVL, reconnect_ivl, int);
|
|||||||
#ifdef ZMQ_RECONNECT_IVL_MAX
|
#ifdef ZMQ_RECONNECT_IVL_MAX
|
||||||
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_IVL_MAX, reconnect_ivl_max, int);
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_IVL_MAX, reconnect_ivl_max, int);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ZMQ_RECONNECT_STOP
|
||||||
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_STOP, reconnect_stop, int);
|
||||||
|
#endif
|
||||||
#ifdef ZMQ_RECOVERY_IVL
|
#ifdef ZMQ_RECOVERY_IVL
|
||||||
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECOVERY_IVL, recovery_ivl, int);
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECOVERY_IVL, recovery_ivl, int);
|
||||||
#endif
|
#endif
|
||||||
@ -1624,9 +1636,15 @@ ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDHWM, sndhwm, int);
|
|||||||
#ifdef ZMQ_SNDTIMEO
|
#ifdef ZMQ_SNDTIMEO
|
||||||
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDTIMEO, sndtimeo, int);
|
ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDTIMEO, sndtimeo, int);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ZMQ_SOCKS_PASSWORD
|
||||||
|
ZMQ_DEFINE_ARRAY_OPT(ZMQ_SOCKS_PASSWORD, socks_password);
|
||||||
|
#endif
|
||||||
#ifdef ZMQ_SOCKS_PROXY
|
#ifdef ZMQ_SOCKS_PROXY
|
||||||
ZMQ_DEFINE_ARRAY_OPT(ZMQ_SOCKS_PROXY, socks_proxy);
|
ZMQ_DEFINE_ARRAY_OPT(ZMQ_SOCKS_PROXY, socks_proxy);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ZMQ_SOCKS_USERNAME
|
||||||
|
ZMQ_DEFINE_ARRAY_OPT(ZMQ_SOCKS_USERNAME, socks_username);
|
||||||
|
#endif
|
||||||
#ifdef ZMQ_STREAM_NOTIFY
|
#ifdef ZMQ_STREAM_NOTIFY
|
||||||
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_STREAM_NOTIFY, stream_notify, int);
|
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_STREAM_NOTIFY, stream_notify, int);
|
||||||
#endif
|
#endif
|
||||||
@ -1684,6 +1702,9 @@ ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_VERBOSER, xpub_verboser, int);
|
|||||||
#ifdef ZMQ_XPUB_MANUAL
|
#ifdef ZMQ_XPUB_MANUAL
|
||||||
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_MANUAL, xpub_manual, int);
|
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_MANUAL, xpub_manual, int);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef ZMQ_XPUB_MANUAL_LAST_VALUE
|
||||||
|
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_MANUAL_LAST_VALUE, xpub_manual_last_value, int);
|
||||||
|
#endif
|
||||||
#ifdef ZMQ_XPUB_NODROP
|
#ifdef ZMQ_XPUB_NODROP
|
||||||
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_NODROP, xpub_nodrop, int);
|
ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_NODROP, xpub_nodrop, int);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user