Merge pull request #684 from sappo/master

Regen and release preperation

Author: keent

NEWS

@@ -1,6 +1,32 @@
-Zyre version 2.0.1 stable, released on 20xx/xx/xx
+Zyre version 2.0.1 stable, released on 2021/01/22
 =================================================
 
+* New features in DRAFT state
+
+  - Leader election, allows to elect a group leader between participating peers
+
+* The following new APIs have been added to the Zyre class:
+
+  - zyre_set_silent_timeout (zyre_t *self, int interval)
+
+* The following new DRAFT APIs have been added to the Zyre class:
+
+  - zyre_set_beacon_peer_port (zyre_t *self, int port_nbr)
+  - zyre_set_contest_in_group (zyre_t *self, const char *group)
+  - zyre_set_advertised_endpoint (zyre_t *self, const char *group)
+  - zyre_set_zcert (zyre_t *self, zcert_t *zcert_t)
+  - zyre_set_zap_domain (zyre_t *self, const char *domain)
+  - zyre_gossip_connect_curve (zyre_t *self, const)
+  - zyre_gossip_unpublish (zyre_t *self, const char *node)
+  - zyre_require_peer (zyre_t *self, const char *uuid, const char *endpoint, const char *public_key)
+  - zyre_socket_zmq (zyre_t *self)
+
+* The following new DRAFT symbols have been added:
+
+  - #define ZAP_DOMAIN_DEFAULT "global"     # Default ZAP domain (auth)
+
+* Many bug fixes. See git log on https://github.com/zeromq/zyre/commits/master
+  for more information.
 
 Zyre version 2.0.0 stable, released on 2017/01/20
 =================================================

bindings/python_cffi/zyre_cffi/cdefs.py

@@ -2769,6 +2769,26 @@
 bool
     zsock_has_in (void *self);
 
+// Get socket option `priority`.
+// Available from libzmq 4.3.0.
+int
+    zsock_priority (void *self);
+
+// Set socket option `priority`.
+// Available from libzmq 4.3.0.
+void
+    zsock_set_priority (void *self, int priority);
+
+// Get socket option `reconnect_stop`.
+// Available from libzmq 4.3.0.
+int
+    zsock_reconnect_stop (void *self);
+
+// Set socket option `reconnect_stop`.
+// Available from libzmq 4.3.0.
+void
+    zsock_set_reconnect_stop (void *self, int reconnect_stop);
+
 // Set socket option `only_first_subscribe`.
 // Available from libzmq 4.3.0.
 void
@@ -3832,7 +3852,7 @@
 
 // Format a string using printf formatting, returning a freshly allocated
 // buffer. If there was insufficient memory, returns NULL. Free the returned
-// string using zstr_free(). The hinted version allows to optimize by using
+// string using zstr_free(). The hinted version allows one to optimize by using
 // a larger starting buffer size (known to/assumed by the developer) and so
 // avoid reallocations.
 char *
@@ -3944,6 +3964,18 @@
 int
     zsys_thread_name_prefix (void);
 
+// Configure the numeric prefix to each thread created for the internal
+// context's thread pool. This option is only supported on Linux.
+// If the environment variable ZSYS_THREAD_NAME_PREFIX_STR is defined, that
+// provides the default.
+// Note that this method is valid only before any socket is created.
+void
+    zsys_set_thread_name_prefix_str (const char *prefix);
+
+// Return thread name prefix.
+const char *
+    zsys_thread_name_prefix_str (void);
+
 // Adds a specific CPU to the affinity list of the ZMQ context thread pool.
 // This option is only supported on Linux.
 // Note that this method is valid only before any socket is created.
@@ -4670,6 +4702,27 @@
 const char *
     zosc_format (zosc_t *self);
 
+// Append data to the osc message. The format describes the data that
+// needs to be appended in the message. This essentially relocates all
+// data!
+// The format type tags are as follows:
+//   i - 32bit integer
+//   h - 64bit integer
+//   f - 32bit floating point number (IEEE)
+//   d - 64bit (double) floating point number
+//   s - string (NULL terminated)
+//   t = timetag: an OSC timetag in NTP format (uint64_t)
+//   S - symbol
+//   c - char
+//   m - 4 byte midi packet (8 digits hexadecimal)
+//   T - TRUE (no value required)
+//   F - FALSE (no value required)
+//   N - NIL (no value required)
+//   I - Impulse (for triggers) or INFINITUM (no value required)
+//   b - binary blob
+int
+    zosc_append (zosc_t *self, const char *format, ...);
+
 // Retrieve the values provided by the given format. Note that zosc_retr
 // creates the objects and the caller must destroy them when finished.
 // The supplied pointers do not need to be initialized. Returns 0 if
@@ -4699,14 +4752,80 @@
 zosc_t *
     zosc_unpack (zframe_t *frame);
 
-// Dump OSC message to stderr, for debugging and tracing.
+// Dump OSC message to stdout, for debugging and tracing.
 void
     zosc_print (zosc_t *self);
 
 // Probe the supplied object, and report if it looks like a zosc_t.
 bool
     zosc_is (void *self);
 
+// Return a pointer to the item at the head of the OSC data.
+// Sets the given char argument to the type tag of the data.
+// If the message is empty, returns NULL and the sets the
+// given char to NULL.
+const void *
+    zosc_first (zosc_t *self, char *type);
+
+// Return the next item of the OSC message. If the list is empty, returns
+// NULL. To move to the start of the OSC message call zosc_first ().
+const void *
+    zosc_next (zosc_t *self, char *type);
+
+// Return a pointer to the item at the tail of the OSC message.
+// Sets the given char argument to the type tag of the data. If
+// the message is empty, returns NULL.
+const void *
+    zosc_last (zosc_t *self, char *type);
+
+// Set the provided 32 bit integer from value at the current cursor position in the message.
+// If the type tag at the current position does not correspond it will fail and
+// return -1. Returns 0 on success.
+int
+    zosc_pop_int32 (zosc_t *self, int *val);
+
+// Set the provided 64 bit integer from the value at the current cursor position in the message.
+// If the type tag at the current position does not correspond it will fail and
+// return -1. Returns 0 on success.
+int
+    zosc_pop_int64 (zosc_t *self, int64_t *val);
+
+// Set the provided float from the value at the current cursor position in the message.
+// If the type tag at the current position does not correspond it will fail and
+// return -1. Returns 0 on success.
+int
+    zosc_pop_float (zosc_t *self, float *val);
+
+// Set the provided double from the value at the current cursor position in the message.
+// If the type tag at the current position does not correspond it will fail and
+// return -1. Returns 0 on success.
+int
+    zosc_pop_double (zosc_t *self, double *val);
+
+// Set the provided string from the value at the current cursor position in the message.
+// If the type tag at the current position does not correspond it will fail and
+// return -1. Returns 0 on success. Caller owns the string!
+int
+    zosc_pop_string (zosc_t *self, char **val);
+
+// Set the provided char from the value at the current cursor position in the message.
+// If the type tag at the current position does not correspond it will fail and
+// return -1. Returns 0 on success.
+int
+    zosc_pop_char (zosc_t *self, char *val);
+
+// Set the provided boolean from the type tag in the message. Booleans are not represented
+// in the data in the message, only in the type tag. If the type tag at the current
+// position does not correspond it will fail and return -1. Returns 0 on success.
+int
+    zosc_pop_bool (zosc_t *self, bool *val);
+
+// Set the provided 4 bytes (unsigned 32bit int) from the value at the current
+// cursor position in the message. If the type tag at the current position does
+// not correspond it will fail and return -1. Returns 0 on success.
+int
+    zosc_pop_midi (zosc_t *self, uint32_t *val);
+
 // Self test of this class.
 void
     zosc_test (bool verbose);

bindings/qt/src/qzsock.cpp

@@ -463,6 +463,42 @@ bool QZsock::hasIn ()
     return rv;
 }
 
+///
+//  Get socket option `priority`.
+//  Available from libzmq 4.3.0.
+int QZsock::priority ()
+{
+    int rv = zsock_priority (self);
+    return rv;
+}
+
+///
+//  Set socket option `priority`.
+//  Available from libzmq 4.3.0.
+void QZsock::setPriority (int priority)
+{
+    zsock_set_priority (self, priority);
+
+}
+
+///
+//  Get socket option `reconnect_stop`.
+//  Available from libzmq 4.3.0.
+int QZsock::reconnectStop ()
+{
+    int rv = zsock_reconnect_stop (self);
+    return rv;
+}
+
+///
+//  Set socket option `reconnect_stop`.
+//  Available from libzmq 4.3.0.
+void QZsock::setReconnectStop (int reconnectStop)
+{
+    zsock_set_reconnect_stop (self, reconnectStop);
+
+}
+
 ///
 //  Set socket option `only_first_subscribe`.
 //  Available from libzmq 4.3.0.

bindings/qt/src/qzsock.h

@@ -265,6 +265,22 @@ class QT_ZYRE_EXPORT QZsock : public QObject
     //  Check whether the socket has available message to read.
     bool hasIn ();
 
+    //  Get socket option `priority`.
+    //  Available from libzmq 4.3.0.
+    int priority ();
+
+    //  Set socket option `priority`.
+    //  Available from libzmq 4.3.0.
+    void setPriority (int priority);
+
+    //  Get socket option `reconnect_stop`.
+    //  Available from libzmq 4.3.0.
+    int reconnectStop ();
+
+    //  Set socket option `reconnect_stop`.
+    //  Available from libzmq 4.3.0.
+    void setReconnectStop (int reconnectStop);
+
     //  Set socket option `only_first_subscribe`.
     //  Available from libzmq 4.3.0.
     void setOnlyFirstSubscribe (int onlyFirstSubscribe);