From 3cb79f5042cf32cdb7b1b58d4acf17eba85ec9f7 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 19 Mar 2018 21:23:59 +0000 Subject: [PATCH] Problem: ZMQ_BINDTODEVICE has met STABLE conditions Solution: move them from DRAFT to STABLE since it's been in a public release, committed for 6+ months and has not changed. --- NEWS | 4 ++++ include/zmq.h | 2 +- src/zmq_draft.h | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index c0dbb26e..556e847f 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,10 @@ - ZMQ_GSSAPI_NT_USER_NAME - ZMQ_GSSAPI_NT_KRB5_PRINCIPAL See doc/zmq_gssapi.txt for details. + - ZMQ_BINDTODEVICE socket option (Linux only), which will bind the + socket(s) to the specified interface. Allows to use Linux VRF, see: + https://www.kernel.org/doc/Documentation/networking/vrf.txt + NOTE: requires the program to be ran as root OR with CAP_NET_RAW 0MQ version 4.2.4 stable, released on 2018/03/21 diff --git a/include/zmq.h b/include/zmq.h index ce82b729..418acc8f 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -375,6 +375,7 @@ ZMQ_EXPORT const char *zmq_msg_gets (const zmq_msg_t *msg, #define ZMQ_USE_FD 89 #define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90 #define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91 +#define ZMQ_BINDTODEVICE 92 /* Message options */ #define ZMQ_MORE 1 @@ -592,7 +593,6 @@ ZMQ_EXPORT void zmq_threadclose (void *thread); #define ZMQ_DGRAM 18 /* DRAFT Socket options. */ -#define ZMQ_BINDTODEVICE 92 #define ZMQ_ZAP_ENFORCE_DOMAIN 93 #define ZMQ_LOOPBACK_FASTPATH 94 #define ZMQ_METADATA 95 diff --git a/src/zmq_draft.h b/src/zmq_draft.h index 4b58ddee..10734890 100644 --- a/src/zmq_draft.h +++ b/src/zmq_draft.h @@ -51,7 +51,6 @@ unsigned long zmq_stopwatch_intermediate (void *watch_); #define ZMQ_DGRAM 18 /* DRAFT Socket options. */ -#define ZMQ_BINDTODEVICE 92 #define ZMQ_ZAP_ENFORCE_DOMAIN 93 #define ZMQ_LOOPBACK_FASTPATH 94 #define ZMQ_METADATA 95