3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 16:15:23 +08:00
Code Issues Projects Releases Wiki Activity

Problem: DRAFT GSSAPI socket options in wrong section cause duplication

Browse Source 
Solution: move them together with the other DRAFT socket options, and
change value of DRAFT ZMQ_BINDTODEVICE from 90 to 92 to avoid clash
This commit is contained in:
Luca Boccassi 2017-08-19 17:32:02 +01:00
parent 6f49e40e36
commit c8097af884
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/zmq.h
View File

@ -565,7 +565,9 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
#define ZMQ_DGRAM 18 #define ZMQ_DGRAM 18
/* DRAFT Socket options. */ /* DRAFT Socket options. */
#define ZMQ_BINDTODEVICE 90 #define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
#define ZMQ_BINDTODEVICE 92
/* DRAFT 0MQ socket events and monitoring */ /* DRAFT 0MQ socket events and monitoring */
/* Unspecified system errors during handshake. Event value is an errno. */ /* Unspecified system errors during handshake. Event value is an errno. */
@ -677,12 +679,9 @@ ZMQ_EXPORT long zmq_timers_timeout (void *timers);
ZMQ_EXPORT int zmq_timers_execute (void *timers); ZMQ_EXPORT int zmq_timers_execute (void *timers);
/******************************************************************************/ /******************************************************************************/
/* GSSAPI socket options to set name type */ /* GSSAPI definitions */
/******************************************************************************/ /******************************************************************************/
#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
/* GSSAPI principal name types */ /* GSSAPI principal name types */
#define ZMQ_GSSAPI_NT_HOSTBASED 0 #define ZMQ_GSSAPI_NT_HOSTBASED 0
#define ZMQ_GSSAPI_NT_USER_NAME 1 #define ZMQ_GSSAPI_NT_USER_NAME 1

9
src/zmq_draft.h
View File

@ -47,7 +47,9 @@
#define ZMQ_DGRAM 18 #define ZMQ_DGRAM 18
/* DRAFT Socket options. */ /* DRAFT Socket options. */
#define ZMQ_BINDTODEVICE 90 #define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
#define ZMQ_BINDTODEVICE 92
/* DRAFT 0MQ socket events and monitoring */ /* DRAFT 0MQ socket events and monitoring */
/* Unspecified system errors during handshake. Event value is an errno. */ /* Unspecified system errors during handshake. Event value is an errno. */
@ -155,12 +157,9 @@ long zmq_timers_timeout (void *timers);
int zmq_timers_execute (void *timers); int zmq_timers_execute (void *timers);
/******************************************************************************/ /******************************************************************************/
/* GSSAPI socket options to set name type */ /* GSSAPI definitions */
/******************************************************************************/ /******************************************************************************/
#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
/* GSSAPI principal name types */ /* GSSAPI principal name types */
#define ZMQ_GSSAPI_NT_HOSTBASED 0 #define ZMQ_GSSAPI_NT_HOSTBASED 0
#define ZMQ_GSSAPI_NT_USER_NAME 1 #define ZMQ_GSSAPI_NT_USER_NAME 1