Merge pull request #3833 from bluca/news

News out of date, formatting not clean

NEWS

@@ -17,6 +17,10 @@
   - ZMQ_ONLY_FIRST_SUBSCRIBE will cause only the first part of a multipart
     message to be processed as a subscribe/unsubscribe message, and the rest
     will be forwarded as user data to the application.
+  - ZMQ_RECONNECT_STOP will cause a connecting socket to stop trying to
+    reconnect in specific circumstances. In this release, this can be set to
+    ECONNREFUSED errors, which implies the other end is not listening on the
+    requested port.
   See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
 
 * New DRAFT (see NEWS for 4.2.0) zmq_ctx_get_ext/zmq_ctx_set_ext APIs were added
@@ -29,6 +33,13 @@
   options were added to support TLS.
   WebSockets support is disabled by default if DRAFT APIs are disabled.
 
+* New DRAFT (see NEWS for 4.2.0) socket type, PEER, which is thread safe and a
+  related zmq_connect_peer function which atomically and thread-safely connects
+  and returns a routing-id.
+
+* ZMTP 3.1 is now fully implemented, and 3.1 peers will receive subscribe/cancel
+  on PUB/SUB via commands rather than using the first byte of the payload.
+
 * Fixed #3566 - malformed CURVE message can cause memory leak
 
 * Fixed #3567 - missing ZeroMQ_INCLUDE_DIR in ZeroMQConfig.cmake when only
@@ -100,6 +111,11 @@
 
 * Fixed #3778 - fix documentation of zmq_poller's thread safety
 
+* Fixed #3792 - do not allow creation of new sockets after zmq_ctx_shutdown
+
+* Fixed #3805 - improve performance of CURVE by reducing copies
+
+* Fixed #3814 - send subscribe/cancel as commands to ZMTP 3.1 peers
 
 0MQ version 4.3.2 stable, released on 2019/07/08
 ================================================

include/zmq.h

@@ -263,7 +263,7 @@ typedef struct zmq_msg_t
 #endif
 } zmq_msg_t;
 
-typedef void (zmq_free_fn) (void *data_, void *hint_);
+typedef void(zmq_free_fn) (void *data_, void *hint_);
 
 ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg_);
 ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_);
@@ -597,7 +597,7 @@ ZMQ_EXPORT void zmq_atomic_counter_destroy (void **counter_p_);
 
 #define ZMQ_HAVE_TIMERS
 
-typedef void (zmq_timer_fn) (int timer_id, void *arg);
+typedef void(zmq_timer_fn) (int timer_id, void *arg);
 
 ZMQ_EXPORT void *zmq_timers_new (void);
 ZMQ_EXPORT int zmq_timers_destroy (void **timers_p);
@@ -634,7 +634,7 @@ ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
 /*  Sleeps for specified number of seconds.                                   */
 ZMQ_EXPORT void zmq_sleep (int seconds_);
 
-typedef void (zmq_thread_fn) (void *);
+typedef void(zmq_thread_fn) (void *);
 
 /* Start a thread. Returns a handle to the thread.                            */
 ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn *func_, void *arg_);

perf/proxy_thr.cpp

@@ -77,9 +77,12 @@
 // This macro is used to avoid-variable warning. If used with an expression,
 // the sizeof is not evaluated to avoid polluting the assembly code.
 #ifdef NDEBUG
-#define ASSERT_EXPR_SAFE(x) do { (void)sizeof(x);} while (0)
+#define ASSERT_EXPR_SAFE(x)                                                    \
+    do {                                                                       \
+        (void) sizeof (x);                                                     \
+    } while (0)
 #else
-#define ASSERT_EXPR_SAFE(x) assert(x)
+#define ASSERT_EXPR_SAFE(x) assert (x)
 #endif
 
 

src/msg.hpp

@@ -46,7 +46,7 @@
 //  Note that it has to be declared as "C" so that it is the same as
 //  zmq_free_fn defined in zmq.h.
 extern "C" {
-typedef void (msg_free_fn) (void *data_, void *hint_);
+typedef void(msg_free_fn) (void *data_, void *hint_);
 }
 
 namespace zmq

tests/test_reconnect_options.cpp

@@ -201,8 +201,8 @@ void reconnect_stop_on_refused ()
     int rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
                                              2 * 1000);
     int limit = 0;
-    while ((rc != -1)  && (++limit < 1000)) {
-        print_unexpected_event_stderr(event, rc, 0, -1);
+    while ((rc != -1) && (++limit < 1000)) {
+        print_unexpected_event_stderr (event, rc, 0, -1);
         rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
                                              2 * 1000);
     }