rbczmq 1.7.1 → 1.7.2

data/ext/czmq/include/zframe.h

@@ -105,6 +105,10 @@ CZMQ_EXPORT void
 CZMQ_EXPORT bool
     zframe_eq (zframe_t *self, zframe_t *other);
 
+//   Print contents of the frame to FILE stream.
+CZMQ_EXPORT void
+    zframe_fprint (zframe_t *self, const char *prefix, FILE *file);
+
 //  Print contents of frame to stderr
 CZMQ_EXPORT void
     zframe_print (zframe_t *self, const char *prefix);
@@ -113,31 +117,14 @@ CZMQ_EXPORT void
 CZMQ_EXPORT void
     zframe_reset (zframe_t *self, const void *data, size_t size);
 
-//  Callback function for zframe_free_fn method
-//  DEPRECATED - will be removed for next stable release
-typedef void (zframe_free_fn) (void *data, void *arg);
-
-//  Create a zero-copy frame
-//  DEPRECATED - will be removed for next stable release
-CZMQ_EXPORT zframe_t *
-    zframe_new_zero_copy (void *data, size_t size,
-                          zframe_free_fn *free_fn, void *arg);
-
-// Return frame zero copy indicator (1 or 0)
-//  DEPRECATED - will be removed for next stable release
-CZMQ_EXPORT int
-    zframe_zero_copy (zframe_t *self);
-
-//  Set the free callback for frame
-//  DEPRECATED - will be removed at next stable release
-CZMQ_EXPORT void
-    zframe_freefn (zframe_t *self, zframe_free_fn *free_fn, void *arg);
-
 //  Self test of this class
 CZMQ_EXPORT int
     zframe_test (bool verbose);
 //  @end
 
+//  Deprecated method aliases
+#define zframe_print_to_stream(s,p,F) zframe_fprint(s,p,F)
+
 #ifdef __cplusplus
 }
 #endif

data/ext/czmq/include/zhash.h

@@ -99,6 +99,12 @@ CZMQ_EXPORT zlist_t *
 CZMQ_EXPORT int
     zhash_foreach (zhash_t *self, zhash_foreach_fn *callback, void *argument);
 
+//  Add comment to hash table before saving to disk. You can add as many
+//  comment lines as you like. These comment lines are discarded when loading
+//  the file. If you use a null format, all comments are deleted.
+CZMQ_EXPORT void
+    zhash_comment (zhash_t *self, char *format, ...);
+
 //  Save hash table to a text file in name=value format. Hash values must be
 //  printable strings; keys may not contain '=' character. Returns 0 if OK,
 //  else -1 if a file error occurred.
@@ -111,6 +117,13 @@ CZMQ_EXPORT int
 CZMQ_EXPORT int
     zhash_load (zhash_t *self, char *filename);
 
+//  When a hash table was loaded from a file by zhash_load, this method will
+//  reload the file if it has been modified since, and is "stable", i.e. not
+//  still changing. Returns 0 if OK, -1 if there was an error reloading the 
+//  file.
+CZMQ_EXPORT int
+    zhash_refresh (zhash_t *self);
+
 //  Set hash for automatic value destruction
 CZMQ_EXPORT void
     zhash_autofree (zhash_t *self);

data/ext/czmq/include/zlist.h

@@ -85,10 +85,6 @@ CZMQ_EXPORT void
 CZMQ_EXPORT zlist_t *
     zlist_dup (zlist_t *self);
 
-//  Copy the entire list, return the copy (deprecated)
-CZMQ_EXPORT zlist_t *
-    zlist_copy (zlist_t *self);
-
 //  Return number of items in the list
 CZMQ_EXPORT size_t
     zlist_size (zlist_t *self);

data/ext/czmq/include/zloop.h

@@ -59,6 +59,11 @@ CZMQ_EXPORT int
 CZMQ_EXPORT void
     zloop_poller_end (zloop_t *self, zmq_pollitem_t *item);
 
+//  Configure a registered pollitem to ignore errors. If you do not set this, 
+//  then pollitems that have errors are removed from the reactor silently.
+CZMQ_EXPORT void
+    zloop_set_tolerant (zloop_t *self, zmq_pollitem_t *item);
+
 //  Register a timer that expires after some delay and repeats some number of
 //  times. At each expiry, will call the handler, passing the arg. To
 //  run a timer forever, use 0 times. Returns 0 if OK, -1 if there was an
@@ -86,11 +91,6 @@ CZMQ_EXPORT void
     zloop_test (bool verbose);
 //  @end
 
-
-// to suppress disabling the event handler on POLLERR
-// set this in pollitem.events
-#define ZMQ_IGNERR 8
-
 #ifdef __cplusplus
 }
 #endif

data/ext/czmq/include/zmsg.h

@@ -42,40 +42,57 @@ CZMQ_EXPORT zmsg_t *
 CZMQ_EXPORT void
     zmsg_destroy (zmsg_t **self_p);
 
-//  Read 1 or more frames off the socket, into a new message object
+//  Receive message from socket, returns zmsg_t object or NULL if the recv
+//  was interrupted. Does a blocking recv, if you want to not block then use
+//  the zloop class or zmq_poll to check for socket input before receiving.
 CZMQ_EXPORT zmsg_t *
     zmsg_recv (void *socket);
 
-//  Send a message to the socket, and then destroy it
+//  Send message to socket, destroy after sending. If the message has no
+//  frames, sends nothing but destroys the message anyhow. Safe to call
+//  if zmsg is null.
 CZMQ_EXPORT int
     zmsg_send (zmsg_t **self_p, void *socket);
 
-//  Return number of frames in message
+//  Return size of message, i.e. number of frames (0 or more).
 CZMQ_EXPORT size_t
     zmsg_size (zmsg_t *self);
 
-//  Return combined size of all frames in message
+//  Return total size of all frames in message.
 CZMQ_EXPORT size_t
     zmsg_content_size (zmsg_t *self);
 
-//  Push frame to front of message, before first frame
+//  Push frame to the front of the message, i.e. before all other frames.
+//  Message takes ownership of frame, will destroy it when message is sent.
+//  Returns 0 on success, -1 on error.
 CZMQ_EXPORT int
     zmsg_push (zmsg_t *self, zframe_t *frame);
 
-//  Pop frame off front of message, caller now owns frame
+//  Remove first frame from message, if any. Returns frame, or NULL. Caller
+//  now owns frame and must destroy it when finished with it.
 CZMQ_EXPORT zframe_t *
     zmsg_pop (zmsg_t *self);
 
-//  Add frame to end of message, after last frame
+//  Add frame to the end of the message, i.e. after all other frames.
+//  Message takes ownership of frame, will destroy it when message is sent.
+//  Returns 0 on success. Deprecates zmsg_add, which did not nullify the
+//  caller's frame reference.
+CZMQ_EXPORT int
+    zmsg_append (zmsg_t *self, zframe_t **frame_p);
+
+//  Add frame to the end of the message, i.e. after all other frames.
+//  Message takes ownership of frame, will destroy it when message is sent.
+//  Returns 0 on success.
+//  DEPRECATED - will be removed for next stable release
 CZMQ_EXPORT int
     zmsg_add (zmsg_t *self, zframe_t *frame);
 
-//  Push block of memory as new frame to front of message.
+//  Push block of memory to front of message, as a new frame.
 //  Returns 0 on success, -1 on error.
 CZMQ_EXPORT int
     zmsg_pushmem (zmsg_t *self, const void *src, size_t size);
 
-//  Push block of memory as new frame to end of message.
+//  Add block of memory to the end of the message, as a new frame.
 //  Returns 0 on success, -1 on error.
 CZMQ_EXPORT int
     zmsg_addmem (zmsg_t *self, const void *src, size_t size);
@@ -90,12 +107,13 @@ CZMQ_EXPORT int
 CZMQ_EXPORT int
     zmsg_addstr (zmsg_t *self, const char *format, ...);
 
-//  Pop frame off front of message, return as fresh string
+//  Pop frame off front of message, return as fresh string. If there were
+//  no more frames in the message, returns NULL.
 CZMQ_EXPORT char *
     zmsg_popstr (zmsg_t *self);
 
-//  Push frame to front of message, before first frame
-//  Pushes an empty frame in front of frame
+//  Push frame plus empty frame to front of message, before first frame.
+//  Message takes ownership of frame, will destroy it when message is sent.
 CZMQ_EXPORT void
     zmsg_wrap (zmsg_t *self, zframe_t *frame);
 
@@ -104,54 +122,66 @@ CZMQ_EXPORT void
 CZMQ_EXPORT zframe_t *
     zmsg_unwrap (zmsg_t *self);
 
-//  Remove frame from message, at any position, caller owns it
+//  Remove specified frame from list, if present. Does not destroy frame.
 CZMQ_EXPORT void
     zmsg_remove (zmsg_t *self, zframe_t *frame);
 
-//  Return first frame in message, or null
+//  Set cursor to first frame in message. Returns frame, or NULL, if the 
+//  message is empty. Use this to navigate the frames as a list.
 CZMQ_EXPORT zframe_t *
     zmsg_first (zmsg_t *self);
 
-//  Return next frame in message, or null
+//  Return the next frame. If there are no more frames, returns NULL. To move
+//  to the first frame call zmsg_first(). Advances the cursor.
 CZMQ_EXPORT zframe_t *
     zmsg_next (zmsg_t *self);
 
-//  Return last frame in message, or null
+//  Return the last frame. If there are no frames, returns NULL.
 CZMQ_EXPORT zframe_t *
     zmsg_last (zmsg_t *self);
 
-//  Save message to an open file, return 0 if OK, else -1.
+//  Save message to an open file, return 0 if OK, else -1. The message is 
+//  saved as a series of frames, each with length and data. Note that the
+//  file is NOT guaranteed to be portable between operating systems, not
+//  versions of CZMQ. The file format is at present undocumented and liable
+//  to arbitrary change.
 CZMQ_EXPORT int
     zmsg_save (zmsg_t *self, FILE *file);
 
 //  Load/append an open file into message, create new message if
-//  null message provided.
+//  null message provided. Returns NULL if the message could not 
+//  be loaded.
 CZMQ_EXPORT zmsg_t *
     zmsg_load (zmsg_t *self, FILE *file);
 
-//  Encode message to a new buffer, return buffer size
+//  Serialize multipart message to a single buffer. Use this method to send
+//  structured messages across transports that do not support multipart data.
+//  Allocates and returns a new buffer containing the serialized message.
+//  To decode a serialized message buffer, use zmsg_decode ().
 CZMQ_EXPORT size_t
     zmsg_encode (zmsg_t *self, byte **buffer);
 
-//  Decode a buffer into a new message, returns NULL if buffer is not
-//  properly formatted.
+//  Decodes a serialized message buffer created by zmsg_encode () and returns
+//  a new zmsg_t object. Returns NULL if the buffer was badly formatted or 
+//  there was insufficient memory to work.
 CZMQ_EXPORT zmsg_t *
     zmsg_decode (byte *buffer, size_t buffer_size);
 
-//  Create copy of message, as new message object
+//  Create copy of message, as new message object. Returns a fresh zmsg_t
+//  object, or NULL if there was not enough heap memory.
 CZMQ_EXPORT zmsg_t *
     zmsg_dup (zmsg_t *self);
 
-//  Print message to stderr, for debugging
+//  Dump message to stderr, for debugging and tracing.
+//  See zmsg_dump_to_stream() for details
 CZMQ_EXPORT void
     zmsg_dump (zmsg_t *self);
 
-//  Push block of memory as new frame to end of message.
-//  The frame is constructed using zero-copy.
-//  Returns 0 on success, -1 on error.
-//  DEPRECATED - will be removed for next stable release
-CZMQ_EXPORT int
-    zmsg_addmem_zero_copy (zmsg_t *self, void *src, size_t size, zframe_free_fn *free_fn, void *arg);
+//  Dump message to FILE stream, for debugging and tracing. 
+//  Truncates to first 10 frames, for readability; this may be unfortunate
+//  when debugging larger and more complex messages.
+CZMQ_EXPORT void
+    zmsg_dump_to_stream (zmsg_t *self, FILE *file);
 
 //  Self test of this class
 CZMQ_EXPORT int

data/ext/czmq/include/zmutex.h

@@ -50,6 +50,11 @@ CZMQ_EXPORT void
 CZMQ_EXPORT void
     zmutex_unlock (zmutex_t *self);
 
+//  Try to lock mutex
+CZMQ_EXPORT int
+    zmutex_try_lock (zmutex_t *self);
+
+
 //  Self test of this class
 CZMQ_EXPORT int
     zmutex_test (bool verbose);

data/ext/czmq/include/zpoller.h

@@ -0,0 +1,72 @@
+/*  =========================================================================
+    zpoller - trivial socket poller class
+
+    -------------------------------------------------------------------------
+    Copyright (c) 1991-2013 iMatix Corporation <www.imatix.com>
+    Copyright other contributors as noted in the AUTHORS file.
+
+    This file is part of CZMQ, the high-level C binding for 0MQ:
+    http://czmq.zeromq.org.
+
+    This is free software; you can redistribute it and/or modify it under the
+    terms of the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your option)
+    any later version.
+
+    This software is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABIL-
+    ITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+    Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+    =========================================================================
+*/
+
+#ifndef __zpoller_H_INCLUDED__
+#define __zpoller_H_INCLUDED__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//  Opaque class structure
+typedef struct _zpoller_t zpoller_t;
+
+//  @interface
+//  Create new poller
+CZMQ_EXPORT zpoller_t *
+    zpoller_new (void *reader, ...);
+
+//  Destroy a poller
+CZMQ_EXPORT void
+    zpoller_destroy (zpoller_t **self_p);
+
+//  Poll the registered readers for I/O, return first socket that has input.
+//  This means the order that sockets are defined in the poll list affects
+//  their priority. If you need a balanced poll, use the low level zmq_poll
+//  method directly.
+CZMQ_EXPORT void *
+    zpoller_wait (zpoller_t *self, int timeout);
+
+//  Return true if the last zpoller_wait () call ended because the timeout
+//  expired, without any error.
+CZMQ_EXPORT bool
+    zpoller_expired (zpoller_t *self);
+
+//  Return true if the last zpoller_wait () call ended because the process
+//  was interrupted, or the parent context was destroyed.
+CZMQ_EXPORT bool
+    zpoller_terminated (zpoller_t *self);
+
+//  Self test of this class
+CZMQ_EXPORT int
+    zpoller_test (bool verbose);
+//  @end
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

data/ext/czmq/include/zsocket.h

@@ -9,16 +9,16 @@
     http://czmq.zeromq.org.
 
     This is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by the 
-    Free Software Foundation; either version 3 of the License, or (at your 
+    the terms of the GNU Lesser General Public License as published by the
+    Free Software Foundation; either version 3 of the License, or (at your
     option) any later version.
 
     This software is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABIL-
-    ITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
+    ITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
     Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public License 
+    You should have received a copy of the GNU Lesser General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
     =========================================================================
 */
@@ -35,7 +35,7 @@ extern "C" {
 //  We use this when choosing a port for dynamic binding.
 #define ZSOCKET_DYNFROM     0xc000
 #define ZSOCKET_DYNTO       0xffff
-        
+
 //  Callback function for zero-copy methods
 typedef void (zsocket_free_fn) (void *data, void *arg);
 
@@ -58,6 +58,12 @@ CZMQ_EXPORT void
 CZMQ_EXPORT int
     zsocket_bind (void *socket, const char *format, ...);
 
+//  Unbind a socket from a formatted endpoint.
+//  Returns 0 if OK, -1 if the endpoint was invalid or the function
+//  isn't supported.
+CZMQ_EXPORT int
+    zsocket_unbind (void *socket, const char *format, ...);
+
 //  Connect a socket to a formatted endpoint
 //  Returns 0 if OK, -1 if the endpoint was invalid.
 CZMQ_EXPORT int
@@ -73,7 +79,7 @@ CZMQ_EXPORT int
 //  ready on the socket, else FALSE.
 CZMQ_EXPORT bool
     zsocket_poll (void *socket, int msecs);
-    
+
 //  Returns socket type as printable constant string
 CZMQ_EXPORT char *
     zsocket_type_str (void *socket);
@@ -83,15 +89,6 @@ CZMQ_EXPORT char *
 CZMQ_EXPORT int
     zsocket_sendmem (void *socket, const void* data, size_t size, int flags);
 
-//  Send data over a socket as a single frame
-//  Returns -1 on error, 0 on success
-//  DEPRECATED - will be removed for next stable release
-CZMQ_EXPORT int
-    zsocket_sendmem_zero_copy (void *socket, void *data, size_t size, 
-                               zsocket_free_fn *free_fn,
-                               void *hint, int flags);
-
-    
 //  Self test of this class
 CZMQ_EXPORT int
     zsocket_test (bool verbose);

data/ext/czmq/include/zsockopt.h

@@ -36,60 +36,99 @@ extern "C" {
 #endif
 
 //  @interface
-#if (ZMQ_VERSION_MAJOR == 2)
+#if (ZMQ_VERSION_MAJOR == 4)
 //  Get socket options
-CZMQ_EXPORT int zsocket_hwm (void *zocket);
-CZMQ_EXPORT int zsocket_swap (void *zocket);
+CZMQ_EXPORT int zsocket_ipv6 (void *zocket);
+CZMQ_EXPORT int zsocket_ipv4only (void *zocket);
+CZMQ_EXPORT int zsocket_probe_router (void *zocket);
+CZMQ_EXPORT int zsocket_plain_server (void *zocket);
+CZMQ_EXPORT char * zsocket_plain_username (void *zocket);
+CZMQ_EXPORT char * zsocket_plain_password (void *zocket);
+CZMQ_EXPORT int zsocket_curve_server (void *zocket);
+CZMQ_EXPORT char * zsocket_curve_publickey (void *zocket);
+CZMQ_EXPORT char * zsocket_curve_secretkey (void *zocket);
+CZMQ_EXPORT char * zsocket_curve_serverkey (void *zocket);
+CZMQ_EXPORT char * zsocket_zap_domain (void *zocket);
+CZMQ_EXPORT int zsocket_type (void *zocket);
+CZMQ_EXPORT int zsocket_sndhwm (void *zocket);
+CZMQ_EXPORT int zsocket_rcvhwm (void *zocket);
 CZMQ_EXPORT int zsocket_affinity (void *zocket);
 CZMQ_EXPORT char * zsocket_identity (void *zocket);
 CZMQ_EXPORT int zsocket_rate (void *zocket);
 CZMQ_EXPORT int zsocket_recovery_ivl (void *zocket);
-CZMQ_EXPORT int zsocket_recovery_ivl_msec (void *zocket);
-CZMQ_EXPORT int zsocket_mcast_loop (void *zocket);
-#   if (ZMQ_VERSION_MINOR == 2)
-CZMQ_EXPORT int zsocket_rcvtimeo (void *zocket);
-#   endif
-#   if (ZMQ_VERSION_MINOR == 2)
-CZMQ_EXPORT int zsocket_sndtimeo (void *zocket);
-#   endif
 CZMQ_EXPORT int zsocket_sndbuf (void *zocket);
 CZMQ_EXPORT int zsocket_rcvbuf (void *zocket);
 CZMQ_EXPORT int zsocket_linger (void *zocket);
 CZMQ_EXPORT int zsocket_reconnect_ivl (void *zocket);
 CZMQ_EXPORT int zsocket_reconnect_ivl_max (void *zocket);
 CZMQ_EXPORT int zsocket_backlog (void *zocket);
-CZMQ_EXPORT int zsocket_type (void *zocket);
+CZMQ_EXPORT int zsocket_maxmsgsize (void *zocket);
+CZMQ_EXPORT int zsocket_multicast_hops (void *zocket);
+CZMQ_EXPORT int zsocket_rcvtimeo (void *zocket);
+CZMQ_EXPORT int zsocket_sndtimeo (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive_idle (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive_cnt (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive_intvl (void *zocket);
+CZMQ_EXPORT char * zsocket_tcp_accept_filter (void *zocket);
 CZMQ_EXPORT int zsocket_rcvmore (void *zocket);
 CZMQ_EXPORT int zsocket_fd (void *zocket);
 CZMQ_EXPORT int zsocket_events (void *zocket);
+CZMQ_EXPORT char * zsocket_last_endpoint (void *zocket);
 
 //  Set socket options
-CZMQ_EXPORT void zsocket_set_hwm (void *zocket, int hwm);
-CZMQ_EXPORT void zsocket_set_swap (void *zocket, int swap);
+CZMQ_EXPORT void zsocket_set_ipv6 (void *zocket, int ipv6);
+CZMQ_EXPORT void zsocket_set_immediate (void *zocket, int immediate);
+CZMQ_EXPORT void zsocket_set_router_raw (void *zocket, int router_raw);
+CZMQ_EXPORT void zsocket_set_ipv4only (void *zocket, int ipv4only);
+CZMQ_EXPORT void zsocket_set_delay_attach_on_connect (void *zocket, int delay_attach_on_connect);
+CZMQ_EXPORT void zsocket_set_router_mandatory (void *zocket, int router_mandatory);
+CZMQ_EXPORT void zsocket_set_req_relaxed (void *zocket, int req_relaxed);
+CZMQ_EXPORT void zsocket_set_req_correlate (void *zocket, int req_correlate);
+CZMQ_EXPORT void zsocket_set_conflate (void *zocket, int conflate);
+CZMQ_EXPORT void zsocket_set_plain_server (void *zocket, int plain_server);
+CZMQ_EXPORT void zsocket_set_plain_username (void *zocket, const char * plain_username);
+CZMQ_EXPORT void zsocket_set_plain_password (void *zocket, const char * plain_password);
+CZMQ_EXPORT void zsocket_set_curve_server (void *zocket, int curve_server);
+CZMQ_EXPORT void zsocket_set_curve_publickey (void *zocket, const char * curve_publickey);
+CZMQ_EXPORT void zsocket_set_curve_publickey_bin (void *zocket, const byte *curve_publickey);
+CZMQ_EXPORT void zsocket_set_curve_secretkey (void *zocket, const char * curve_secretkey);
+CZMQ_EXPORT void zsocket_set_curve_secretkey_bin (void *zocket, const byte *curve_secretkey);
+CZMQ_EXPORT void zsocket_set_curve_serverkey (void *zocket, const char * curve_serverkey);
+CZMQ_EXPORT void zsocket_set_curve_serverkey_bin (void *zocket, const byte *curve_serverkey);
+CZMQ_EXPORT void zsocket_set_zap_domain (void *zocket, const char * zap_domain);
+CZMQ_EXPORT void zsocket_set_sndhwm (void *zocket, int sndhwm);
+CZMQ_EXPORT void zsocket_set_rcvhwm (void *zocket, int rcvhwm);
 CZMQ_EXPORT void zsocket_set_affinity (void *zocket, int affinity);
+CZMQ_EXPORT void zsocket_set_subscribe (void *zocket, const char * subscribe);
+CZMQ_EXPORT void zsocket_set_unsubscribe (void *zocket, const char * unsubscribe);
 CZMQ_EXPORT void zsocket_set_identity (void *zocket, const char * identity);
 CZMQ_EXPORT void zsocket_set_rate (void *zocket, int rate);
 CZMQ_EXPORT void zsocket_set_recovery_ivl (void *zocket, int recovery_ivl);
-CZMQ_EXPORT void zsocket_set_recovery_ivl_msec (void *zocket, int recovery_ivl_msec);
-CZMQ_EXPORT void zsocket_set_mcast_loop (void *zocket, int mcast_loop);
-#   if (ZMQ_VERSION_MINOR == 2)
-CZMQ_EXPORT void zsocket_set_rcvtimeo (void *zocket, int rcvtimeo);
-#   endif
-#   if (ZMQ_VERSION_MINOR == 2)
-CZMQ_EXPORT void zsocket_set_sndtimeo (void *zocket, int sndtimeo);
-#   endif
 CZMQ_EXPORT void zsocket_set_sndbuf (void *zocket, int sndbuf);
 CZMQ_EXPORT void zsocket_set_rcvbuf (void *zocket, int rcvbuf);
 CZMQ_EXPORT void zsocket_set_linger (void *zocket, int linger);
 CZMQ_EXPORT void zsocket_set_reconnect_ivl (void *zocket, int reconnect_ivl);
 CZMQ_EXPORT void zsocket_set_reconnect_ivl_max (void *zocket, int reconnect_ivl_max);
 CZMQ_EXPORT void zsocket_set_backlog (void *zocket, int backlog);
-CZMQ_EXPORT void zsocket_set_subscribe (void *zocket, const char * subscribe);
-CZMQ_EXPORT void zsocket_set_unsubscribe (void *zocket, const char * unsubscribe);
+CZMQ_EXPORT void zsocket_set_maxmsgsize (void *zocket, int maxmsgsize);
+CZMQ_EXPORT void zsocket_set_multicast_hops (void *zocket, int multicast_hops);
+CZMQ_EXPORT void zsocket_set_rcvtimeo (void *zocket, int rcvtimeo);
+CZMQ_EXPORT void zsocket_set_sndtimeo (void *zocket, int sndtimeo);
+CZMQ_EXPORT void zsocket_set_xpub_verbose (void *zocket, int xpub_verbose);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive (void *zocket, int tcp_keepalive);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive_idle (void *zocket, int tcp_keepalive_idle);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive_cnt (void *zocket, int tcp_keepalive_cnt);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive_intvl (void *zocket, int tcp_keepalive_intvl);
+CZMQ_EXPORT void zsocket_set_tcp_accept_filter (void *zocket, const char * tcp_accept_filter);
+
+//  Emulation of widely-used 2.x socket options
+CZMQ_EXPORT void zsocket_set_hwm (void *zocket, int hwm);
 #endif
 
 #if (ZMQ_VERSION_MAJOR == 3)
 //  Get socket options
+CZMQ_EXPORT int zsocket_ipv4only (void *zocket);
 CZMQ_EXPORT int zsocket_type (void *zocket);
 CZMQ_EXPORT int zsocket_sndhwm (void *zocket);
 CZMQ_EXPORT int zsocket_rcvhwm (void *zocket);
@@ -107,13 +146,20 @@ CZMQ_EXPORT int zsocket_maxmsgsize (void *zocket);
 CZMQ_EXPORT int zsocket_multicast_hops (void *zocket);
 CZMQ_EXPORT int zsocket_rcvtimeo (void *zocket);
 CZMQ_EXPORT int zsocket_sndtimeo (void *zocket);
-CZMQ_EXPORT int zsocket_ipv4only (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive_idle (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive_cnt (void *zocket);
+CZMQ_EXPORT int zsocket_tcp_keepalive_intvl (void *zocket);
+CZMQ_EXPORT char * zsocket_tcp_accept_filter (void *zocket);
 CZMQ_EXPORT int zsocket_rcvmore (void *zocket);
 CZMQ_EXPORT int zsocket_fd (void *zocket);
 CZMQ_EXPORT int zsocket_events (void *zocket);
 CZMQ_EXPORT char * zsocket_last_endpoint (void *zocket);
 
 //  Set socket options
+CZMQ_EXPORT void zsocket_set_router_raw (void *zocket, int router_raw);
+CZMQ_EXPORT void zsocket_set_ipv4only (void *zocket, int ipv4only);
+CZMQ_EXPORT void zsocket_set_delay_attach_on_connect (void *zocket, int delay_attach_on_connect);
 CZMQ_EXPORT void zsocket_set_sndhwm (void *zocket, int sndhwm);
 CZMQ_EXPORT void zsocket_set_rcvhwm (void *zocket, int rcvhwm);
 CZMQ_EXPORT void zsocket_set_affinity (void *zocket, int affinity);
@@ -132,115 +178,72 @@ CZMQ_EXPORT void zsocket_set_maxmsgsize (void *zocket, int maxmsgsize);
 CZMQ_EXPORT void zsocket_set_multicast_hops (void *zocket, int multicast_hops);
 CZMQ_EXPORT void zsocket_set_rcvtimeo (void *zocket, int rcvtimeo);
 CZMQ_EXPORT void zsocket_set_sndtimeo (void *zocket, int sndtimeo);
-CZMQ_EXPORT void zsocket_set_ipv4only (void *zocket, int ipv4only);
-CZMQ_EXPORT void zsocket_set_delay_attach_on_connect (void *zocket, int delay_attach_on_connect);
-CZMQ_EXPORT void zsocket_set_router_mandatory (void *zocket, int router_mandatory);
-CZMQ_EXPORT void zsocket_set_router_raw (void *zocket, int router_raw);
 CZMQ_EXPORT void zsocket_set_xpub_verbose (void *zocket, int xpub_verbose);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive (void *zocket, int tcp_keepalive);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive_idle (void *zocket, int tcp_keepalive_idle);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive_cnt (void *zocket, int tcp_keepalive_cnt);
+CZMQ_EXPORT void zsocket_set_tcp_keepalive_intvl (void *zocket, int tcp_keepalive_intvl);
+CZMQ_EXPORT void zsocket_set_tcp_accept_filter (void *zocket, const char * tcp_accept_filter);
 
 //  Emulation of widely-used 2.x socket options
-void zsocket_set_hwm (void *zocket, int hwm);
+CZMQ_EXPORT void zsocket_set_hwm (void *zocket, int hwm);
 #endif
 
-//  Self test of this class
-int zsockopt_test (bool verbose);
-//  @end
-
-//  Deprecated function names
 #if (ZMQ_VERSION_MAJOR == 2)
-#define zsockopt_hwm zsocket_hwm
-#define zsockopt_set_hwm zsocket_set_hwm
-#define zsockopt_swap zsocket_swap
-#define zsockopt_set_swap zsocket_set_swap
-#define zsockopt_affinity zsocket_affinity
-#define zsockopt_set_affinity zsocket_set_affinity
-#define zsockopt_identity zsocket_identity
-#define zsockopt_set_identity zsocket_set_identity
-#define zsockopt_rate zsocket_rate
-#define zsockopt_set_rate zsocket_set_rate
-#define zsockopt_recovery_ivl zsocket_recovery_ivl
-#define zsockopt_set_recovery_ivl zsocket_set_recovery_ivl
-#define zsockopt_recovery_ivl_msec zsocket_recovery_ivl_msec
-#define zsockopt_set_recovery_ivl_msec zsocket_set_recovery_ivl_msec
-#define zsockopt_mcast_loop zsocket_mcast_loop
-#define zsockopt_set_mcast_loop zsocket_set_mcast_loop
+//  Get socket options
+CZMQ_EXPORT int zsocket_hwm (void *zocket);
+CZMQ_EXPORT int zsocket_swap (void *zocket);
+CZMQ_EXPORT int zsocket_affinity (void *zocket);
+CZMQ_EXPORT char * zsocket_identity (void *zocket);
+CZMQ_EXPORT int zsocket_rate (void *zocket);
+CZMQ_EXPORT int zsocket_recovery_ivl (void *zocket);
+CZMQ_EXPORT int zsocket_recovery_ivl_msec (void *zocket);
+CZMQ_EXPORT int zsocket_mcast_loop (void *zocket);
 #   if (ZMQ_VERSION_MINOR == 2)
-#define zsockopt_rcvtimeo zsocket_rcvtimeo
-#define zsockopt_set_rcvtimeo zsocket_set_rcvtimeo
+CZMQ_EXPORT int zsocket_rcvtimeo (void *zocket);
 #   endif
 #   if (ZMQ_VERSION_MINOR == 2)
-#define zsockopt_sndtimeo zsocket_sndtimeo
-#define zsockopt_set_sndtimeo zsocket_set_sndtimeo
+CZMQ_EXPORT int zsocket_sndtimeo (void *zocket);
 #   endif
-#define zsockopt_sndbuf zsocket_sndbuf
-#define zsockopt_set_sndbuf zsocket_set_sndbuf
-#define zsockopt_rcvbuf zsocket_rcvbuf
-#define zsockopt_set_rcvbuf zsocket_set_rcvbuf
-#define zsockopt_linger zsocket_linger
-#define zsockopt_set_linger zsocket_set_linger
-#define zsockopt_reconnect_ivl zsocket_reconnect_ivl
-#define zsockopt_set_reconnect_ivl zsocket_set_reconnect_ivl
-#define zsockopt_reconnect_ivl_max zsocket_reconnect_ivl_max
-#define zsockopt_set_reconnect_ivl_max zsocket_set_reconnect_ivl_max
-#define zsockopt_backlog zsocket_backlog
-#define zsockopt_set_backlog zsocket_set_backlog
-#define zsockopt_set_subscribe zsocket_set_subscribe
-#define zsockopt_set_unsubscribe zsocket_set_unsubscribe
-#define zsockopt_type zsocket_type
-#define zsockopt_rcvmore zsocket_rcvmore
-#define zsockopt_fd zsocket_fd
-#define zsockopt_events zsocket_events
-#endif
+CZMQ_EXPORT int zsocket_sndbuf (void *zocket);
+CZMQ_EXPORT int zsocket_rcvbuf (void *zocket);
+CZMQ_EXPORT int zsocket_linger (void *zocket);
+CZMQ_EXPORT int zsocket_reconnect_ivl (void *zocket);
+CZMQ_EXPORT int zsocket_reconnect_ivl_max (void *zocket);
+CZMQ_EXPORT int zsocket_backlog (void *zocket);
+CZMQ_EXPORT int zsocket_type (void *zocket);
+CZMQ_EXPORT int zsocket_rcvmore (void *zocket);
+CZMQ_EXPORT int zsocket_fd (void *zocket);
+CZMQ_EXPORT int zsocket_events (void *zocket);
 
-//  Deprecated function names
-#if (ZMQ_VERSION_MAJOR == 3)
-#define zsockopt_type zsocket_type
-#define zsockopt_sndhwm zsocket_sndhwm
-#define zsockopt_set_sndhwm zsocket_set_sndhwm
-#define zsockopt_rcvhwm zsocket_rcvhwm
-#define zsockopt_set_rcvhwm zsocket_set_rcvhwm
-#define zsockopt_affinity zsocket_affinity
-#define zsockopt_set_affinity zsocket_set_affinity
-#define zsockopt_set_subscribe zsocket_set_subscribe
-#define zsockopt_set_unsubscribe zsocket_set_unsubscribe
-#define zsockopt_identity zsocket_identity
-#define zsockopt_set_identity zsocket_set_identity
-#define zsockopt_rate zsocket_rate
-#define zsockopt_set_rate zsocket_set_rate
-#define zsockopt_recovery_ivl zsocket_recovery_ivl
-#define zsockopt_set_recovery_ivl zsocket_set_recovery_ivl
-#define zsockopt_sndbuf zsocket_sndbuf
-#define zsockopt_set_sndbuf zsocket_set_sndbuf
-#define zsockopt_rcvbuf zsocket_rcvbuf
-#define zsockopt_set_rcvbuf zsocket_set_rcvbuf
-#define zsockopt_linger zsocket_linger
-#define zsockopt_set_linger zsocket_set_linger
-#define zsockopt_reconnect_ivl zsocket_reconnect_ivl
-#define zsockopt_set_reconnect_ivl zsocket_set_reconnect_ivl
-#define zsockopt_reconnect_ivl_max zsocket_reconnect_ivl_max
-#define zsockopt_set_reconnect_ivl_max zsocket_set_reconnect_ivl_max
-#define zsockopt_backlog zsocket_backlog
-#define zsockopt_set_backlog zsocket_set_backlog
-#define zsockopt_maxmsgsize zsocket_maxmsgsize
-#define zsockopt_set_maxmsgsize zsocket_set_maxmsgsize
-#define zsockopt_multicast_hops zsocket_multicast_hops
-#define zsockopt_set_multicast_hops zsocket_set_multicast_hops
-#define zsockopt_rcvtimeo zsocket_rcvtimeo
-#define zsockopt_set_rcvtimeo zsocket_set_rcvtimeo
-#define zsockopt_sndtimeo zsocket_sndtimeo
-#define zsockopt_set_sndtimeo zsocket_set_sndtimeo
-#define zsockopt_ipv4only zsocket_ipv4only
-#define zsockopt_set_ipv4only zsocket_set_ipv4only
-#define zsockopt_set_delay_attach_on_connect zsocket_set_delay_attach_on_connect
-#define zsockopt_set_router_mandatory zsocket_set_router_mandatory
-#define zsockopt_set_router_raw zsocket_set_router_raw
-#define zsockopt_set_xpub_verbose zsocket_set_xpub_verbose
-#define zsockopt_rcvmore zsocket_rcvmore
-#define zsockopt_fd zsocket_fd
-#define zsockopt_events zsocket_events
-#define zsockopt_last_endpoint zsocket_last_endpoint
+//  Set socket options
+CZMQ_EXPORT void zsocket_set_hwm (void *zocket, int hwm);
+CZMQ_EXPORT void zsocket_set_swap (void *zocket, int swap);
+CZMQ_EXPORT void zsocket_set_affinity (void *zocket, int affinity);
+CZMQ_EXPORT void zsocket_set_identity (void *zocket, const char * identity);
+CZMQ_EXPORT void zsocket_set_rate (void *zocket, int rate);
+CZMQ_EXPORT void zsocket_set_recovery_ivl (void *zocket, int recovery_ivl);
+CZMQ_EXPORT void zsocket_set_recovery_ivl_msec (void *zocket, int recovery_ivl_msec);
+CZMQ_EXPORT void zsocket_set_mcast_loop (void *zocket, int mcast_loop);
+#   if (ZMQ_VERSION_MINOR == 2)
+CZMQ_EXPORT void zsocket_set_rcvtimeo (void *zocket, int rcvtimeo);
+#   endif
+#   if (ZMQ_VERSION_MINOR == 2)
+CZMQ_EXPORT void zsocket_set_sndtimeo (void *zocket, int sndtimeo);
+#   endif
+CZMQ_EXPORT void zsocket_set_sndbuf (void *zocket, int sndbuf);
+CZMQ_EXPORT void zsocket_set_rcvbuf (void *zocket, int rcvbuf);
+CZMQ_EXPORT void zsocket_set_linger (void *zocket, int linger);
+CZMQ_EXPORT void zsocket_set_reconnect_ivl (void *zocket, int reconnect_ivl);
+CZMQ_EXPORT void zsocket_set_reconnect_ivl_max (void *zocket, int reconnect_ivl_max);
+CZMQ_EXPORT void zsocket_set_backlog (void *zocket, int backlog);
+CZMQ_EXPORT void zsocket_set_subscribe (void *zocket, const char * subscribe);
+CZMQ_EXPORT void zsocket_set_unsubscribe (void *zocket, const char * unsubscribe);
 #endif
 
+//  Self test of this class
+int zsockopt_test (bool verbose);
+//  @end
 
 #ifdef __cplusplus
 }