Commit upstream/4.0.1 - czmq

New upstream version 4.0.1 Luca Boccassi 7 years ago

11 changed file(s) with 85 addition(s) and 59 deletion(s). Raw diff Collapse all Expand all

-2

CMakeLists.txt less more

256	256	########################################################################
257	257	# pkgconfig
258	258	########################################################################
259		set (VERSION "4.0.0")
	259	set (VERSION "4.0.1")
260	260	set (prefix "${CMAKE_INSTALL_PREFIX}")
261	261	set (exec_prefix "\${prefix}")
262	262	set (libdir "\${prefix}/lib${LIB_SUFFIX}")

352	352	zproxy
353	353	zrex
354	354	zsys
355		zgossip_msg
356	355	)
357	356
358	357	IF (ENABLE_DRAFTS)

+11

-0

NEWS less more

	0	CZMQ version 4.0.1 stable, released on 2016/11/10
	1	=================================================
	2
	3	* Version 4.0.0 introduced the DRAFT mechanism, but it had a flaw:
	4	the internally defined DRAFT symbols were leaking as global in the
	5	shared library. This meant that although the API was stable, the
	6	ABI could in some cases not be.
	7	This has now been fixed using compiler's visibility attribute to
	8	avoid this problem.
	9
	10
0	11	CZMQ version 4.0.0 stable, released on 2016/11/04
1	12	=================================================
2	13

+10

-10

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.68 for czmq 4.0.0.
	2	# Generated by GNU Autoconf 2.68 for czmq 4.0.1.
3	3	#
4	4	# Report bugs to <zeromq-dev@lists.zeromq.org>.
5	5	#

569	569	# Identity of this package.
570	570	PACKAGE_NAME='czmq'
571	571	PACKAGE_TARNAME='czmq'
572		PACKAGE_VERSION='4.0.0'
573		PACKAGE_STRING='czmq 4.0.0'
	572	PACKAGE_VERSION='4.0.1'
	573	PACKAGE_STRING='czmq 4.0.1'
574	574	PACKAGE_BUGREPORT='zeromq-dev@lists.zeromq.org'
575	575	PACKAGE_URL=''
576	576

1352	1352	# Omit some internal or obsolete options to make the list less imposing.
1353	1353	# This message is too long to be a string in the A/UX 3.1 sh.
1354	1354	cat <<_ACEOF
1355		\`configure' configures czmq 4.0.0 to adapt to many kinds of systems.
	1355	\`configure' configures czmq 4.0.1 to adapt to many kinds of systems.
1356	1356
1357	1357	Usage: $0 [OPTION]... [VAR=VALUE]...
1358	1358

1422	1422
1423	1423	if test -n "$ac_init_help"; then
1424	1424	case $ac_init_help in
1425		short \| recursive ) echo "Configuration of czmq 4.0.0:";;
	1425	short \| recursive ) echo "Configuration of czmq 4.0.1:";;
1426	1426	esac
1427	1427	cat <<\_ACEOF
1428	1428

1553	1553	test -n "$ac_init_help" && exit $ac_status
1554	1554	if $ac_init_version; then
1555	1555	cat <<\_ACEOF
1556		czmq configure 4.0.0
	1556	czmq configure 4.0.1
1557	1557	generated by GNU Autoconf 2.68
1558	1558
1559	1559	Copyright (C) 2010 Free Software Foundation, Inc.

2029	2029	This file contains any messages produced by compilers while
2030	2030	running configure, to aid debugging if configure makes a mistake.
2031	2031
2032		It was created by czmq $as_me 4.0.0, which was
	2032	It was created by czmq $as_me 4.0.1, which was
2033	2033	generated by GNU Autoconf 2.68. Invocation command line was
2034	2034
2035	2035	$ $0 $@

2848	2848
2849	2849	# Define the identity of the package.
2850	2850	PACKAGE='czmq'
2851		VERSION='4.0.0'
	2851	VERSION='4.0.1'
2852	2852
2853	2853
2854	2854	cat >>confdefs.h <<_ACEOF

14905	14905	# report actual input values of CONFIG_FILES etc. instead of their
14906	14906	# values after options handling.
14907	14907	ac_log="
14908		This file was extended by czmq $as_me 4.0.0, which was
	14908	This file was extended by czmq $as_me 4.0.1, which was
14909	14909	generated by GNU Autoconf 2.68. Invocation command line was
14910	14910
14911	14911	CONFIG_FILES = $CONFIG_FILES

14971	14971	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
14972	14972	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14973	14973	ac_cs_version="\\
14974		czmq config.status 4.0.0
	14974	czmq config.status 4.0.1
14975	14975	configured by $0, generated by GNU Autoconf 2.68,
14976	14976	with options \\"\$ac_cs_config\\"
14977	14977

-1

configure.ac less more

6	6	# Process this file with autoconf to produce a configure script.
7	7	AC_PREREQ(2.61)
8	8	#
9		AC_INIT([czmq],[4.0.0],[zeromq-dev@lists.zeromq.org])
	9	AC_INIT([czmq],[4.0.1],[zeromq-dev@lists.zeromq.org])
10	10
11	11	AC_CONFIG_AUX_DIR(config)
12	12	AC_CONFIG_MACRO_DIR(config)

-1

include/czmq_library.h less more

27	27	// CZMQ version macros for compile-time API detection
28	28	#define CZMQ_VERSION_MAJOR 4
29	29	#define CZMQ_VERSION_MINOR 0
30		#define CZMQ_VERSION_PATCH 0
	30	#define CZMQ_VERSION_PATCH 1
31	31
32	32	#define CZMQ_MAKE_VERSION(major, minor, patch) \
33	33	((major) * 10000 + (minor) * 100 + (patch))

48	48	# else
49	49	# define CZMQ_EXPORT __declspec(dllimport)
50	50	# endif
	51	# define CZMQ_PRIVATE
51	52	#else
52	53	# define CZMQ_EXPORT
	54	# if (defined __GNUC__ && __GNUC__ >= 4) \|\| defined __INTEL_COMPILER
	55	# define CZMQ_PRIVATE __attribute__ ((visibility ("hidden")))
	56	# else
	57	# define CZMQ_PRIVATE
	58	# endif
53	59	#endif
54	60
55	61	// Opaque class structures to allow forward references

-0

include/zsock.h less more

1001	1001	CZMQ_EXPORT zsock_t *
1002	1002	zsock_new_stream_checked (const char endpoint, const char filename, size_t line_nbr);
1003	1003
	1004	#ifdef CZMQ_BUILD_DRAFT_API
1004	1005	CZMQ_EXPORT zsock_t *
1005	1006	zsock_new_server_checked (const char endpoint, const char filename, size_t line_nbr);
1006	1007

1018	1019
1019	1020	CZMQ_EXPORT zsock_t *
1020	1021	zsock_new_scatter_checked (const char endpoint, const char filename, size_t line_nbr);
	1022	#endif // CZMQ_BUILD_DRAFT_API
1021	1023
1022	1024	#ifdef __cplusplus
1023	1025	}

+39

-39

src/czmq_classes.h less more

31	31
32	32	// * Draft method, defined for internal use only *
33	33	// Unset certificate metadata.
34		CZMQ_EXPORT void
	34	CZMQ_PRIVATE void
35	35	zcert_unset_meta (zcert_t self, const char name);
36	36
37	37	// * Draft callbacks, defined for internal use only *

44	44
45	45	// * Draft method, defined for internal use only *
46	46	// Override the default disk loader with a custom loader fn.
47		CZMQ_EXPORT void
	47	CZMQ_PRIVATE void
48	48	zcertstore_set_loader (zcertstore_t self, zcertstore_loader loader, zcertstore_destructor destructor, void state);
49	49
50	50	// * Draft method, defined for internal use only *
51	51	// Empty certificate hashtable. This wrapper exists to be friendly to bindings,
52	52	// which don't usually have access to struct internals.
53		CZMQ_EXPORT void
	53	CZMQ_PRIVATE void
54	54	zcertstore_empty (zcertstore_t *self);
55	55
56	56	// * Draft method, defined for internal use only *
57	57	// Return frame routing ID, if the frame came from a ZMQ_SERVER socket.
58	58	// Else returns zero.
59		CZMQ_EXPORT uint32_t
	59	CZMQ_PRIVATE uint32_t
60	60	zframe_routing_id (zframe_t *self);
61	61
62	62	// * Draft method, defined for internal use only *
63	63	// Set routing ID on frame. This is used if/when the frame is sent to a
64	64	// ZMQ_SERVER socket.
65		CZMQ_EXPORT void
	65	CZMQ_PRIVATE void
66	66	zframe_set_routing_id (zframe_t *self, uint32_t routing_id);
67	67
68	68	// * Draft method, defined for internal use only *
69	69	// Return frame group of radio-dish pattern.
70		CZMQ_EXPORT const char *
	70	CZMQ_PRIVATE const char *
71	71	zframe_group (zframe_t *self);
72	72
73	73	// * Draft method, defined for internal use only *
74	74	// Set group on frame. This is used if/when the frame is sent to a
75	75	// ZMQ_RADIO socket.
76	76	// Return -1 on error, 0 on success.
77		CZMQ_EXPORT int
	77	CZMQ_PRIVATE int
78	78	zframe_set_group (zframe_t self, const char group);
79	79
80	80	// * Draft method, defined for internal use only *
81	81	// Same as pack but uses a user-defined serializer function to convert items
82	82	// into longstr.
83	83	// Caller owns return value and must destroy it when done.
84		CZMQ_EXPORT zframe_t *
	84	CZMQ_PRIVATE zframe_t *
85	85	zhashx_pack_own (zhashx_t *self, zhashx_serializer_fn serializer);
86	86
87	87	// * Draft method, defined for internal use only *
88	88	// Same as unpack but uses a user-defined deserializer function to convert
89	89	// a longstr back into item format.
90	90	// Caller owns return value and must destroy it when done.
91		CZMQ_EXPORT zhashx_t *
	91	CZMQ_PRIVATE zhashx_t *
92	92	zhashx_unpack_own (zframe_t *frame, zhashx_deserializer_fn deserializer);
93	93
94	94	// * Draft method, defined for internal use only *
95	95	// Return message routing ID, if the message came from a ZMQ_SERVER socket.
96	96	// Else returns zero.
97		CZMQ_EXPORT uint32_t
	97	CZMQ_PRIVATE uint32_t
98	98	zmsg_routing_id (zmsg_t *self);
99	99
100	100	// * Draft method, defined for internal use only *
101	101	// Set routing ID on message. This is used if/when the message is sent to a
102	102	// ZMQ_SERVER socket.
103		CZMQ_EXPORT void
	103	CZMQ_PRIVATE void
104	104	zmsg_set_routing_id (zmsg_t *self, uint32_t routing_id);
105	105
106	106	// * Draft method, defined for internal use only *
107	107	// Create a SERVER socket. Default action is bind.
108	108	// Caller owns return value and must destroy it when done.
109		CZMQ_EXPORT zsock_t *
	109	CZMQ_PRIVATE zsock_t *
110	110	zsock_new_server (const char *endpoint);
111	111
112	112	// * Draft method, defined for internal use only *
113	113	// Create a CLIENT socket. Default action is connect.
114	114	// Caller owns return value and must destroy it when done.
115		CZMQ_EXPORT zsock_t *
	115	CZMQ_PRIVATE zsock_t *
116	116	zsock_new_client (const char *endpoint);
117	117
118	118	// * Draft method, defined for internal use only *
119	119	// Create a RADIO socket. Default action is bind.
120	120	// Caller owns return value and must destroy it when done.
121		CZMQ_EXPORT zsock_t *
	121	CZMQ_PRIVATE zsock_t *
122	122	zsock_new_radio (const char *endpoint);
123	123
124	124	// * Draft method, defined for internal use only *
125	125	// Create a DISH socket. Default action is connect.
126	126	// Caller owns return value and must destroy it when done.
127		CZMQ_EXPORT zsock_t *
	127	CZMQ_PRIVATE zsock_t *
128	128	zsock_new_dish (const char *endpoint);
129	129
130	130	// * Draft method, defined for internal use only *
131	131	// Create a GATHER socket. Default action is bind.
132	132	// Caller owns return value and must destroy it when done.
133		CZMQ_EXPORT zsock_t *
	133	CZMQ_PRIVATE zsock_t *
134	134	zsock_new_gather (const char *endpoint);
135	135
136	136	// * Draft method, defined for internal use only *
137	137	// Create a SCATTER socket. Default action is connect.
138	138	// Caller owns return value and must destroy it when done.
139		CZMQ_EXPORT zsock_t *
	139	CZMQ_PRIVATE zsock_t *
140	140	zsock_new_scatter (const char *endpoint);
141	141
142	142	// * Draft method, defined for internal use only *
143	143	// Return socket routing ID if any. This returns 0 if the socket is not
144	144	// of type ZMQ_SERVER or if no request was already received on it.
145		CZMQ_EXPORT uint32_t
	145	CZMQ_PRIVATE uint32_t
146	146	zsock_routing_id (zsock_t *self);
147	147
148	148	// * Draft method, defined for internal use only *
149	149	// Set routing ID on socket. The socket MUST be of type ZMQ_SERVER.
150	150	// This will be used when sending messages on the socket via the zsock API.
151		CZMQ_EXPORT void
	151	CZMQ_PRIVATE void
152	152	zsock_set_routing_id (zsock_t *self, uint32_t routing_id);
153	153
154	154	// * Draft method, defined for internal use only *
155	155	// Join a group for the RADIO-DISH pattern. Call only on ZMQ_DISH.
156	156	// Returns 0 if OK, -1 if failed.
157		CZMQ_EXPORT int
	157	CZMQ_PRIVATE int
158	158	zsock_join (void self, const char group);
159	159
160	160	// * Draft method, defined for internal use only *
161	161	// Leave a group for the RADIO-DISH pattern. Call only on ZMQ_DISH.
162	162	// Returns 0 if OK, -1 if failed.
163		CZMQ_EXPORT int
	163	CZMQ_PRIVATE int
164	164	zsock_leave (void self, const char group);
165	165
166	166	// * Draft method, defined for internal use only *
167	167	// Accepts a void pointer and returns a fresh character string. If source
168	168	// is null, returns an empty string.
169	169	// Caller owns return value and must destroy it when done.
170		CZMQ_EXPORT char *
	170	CZMQ_PRIVATE char *
171	171	zstr_str (void *source);
172	172
173	173	// * Draft constants, defined for internal use only *

180	180	// * Draft method, defined for internal use only *
181	181	// Create a new empty zgossip_msg
182	182	// Caller owns return value and must destroy it when done.
183		CZMQ_EXPORT zgossip_msg_t *
	183	CZMQ_PRIVATE zgossip_msg_t *
184	184	zgossip_msg_new (void);
185	185
186	186	// * Draft method, defined for internal use only *
187	187	// Destroy a zgossip_msg instance
188		CZMQ_EXPORT void
	188	CZMQ_PRIVATE void
189	189	zgossip_msg_destroy (zgossip_msg_t **self_p);
190	190
191	191	// * Draft method, defined for internal use only *
192	192	// Receive a zgossip_msg from the socket. Returns 0 if OK, -1 if
193	193	// there was an error. Blocks if there is no message waiting.
194		CZMQ_EXPORT int
	194	CZMQ_PRIVATE int
195	195	zgossip_msg_recv (zgossip_msg_t self, zsock_t input);
196	196
197	197	// * Draft method, defined for internal use only *
198	198	// Send the zgossip_msg to the output socket, does not destroy it
199		CZMQ_EXPORT int
	199	CZMQ_PRIVATE int
200	200	zgossip_msg_send (zgossip_msg_t self, zsock_t output);
201	201
202	202	// * Draft method, defined for internal use only *
203	203	// Print contents of message to stdout
204		CZMQ_EXPORT void
	204	CZMQ_PRIVATE void
205	205	zgossip_msg_print (zgossip_msg_t *self);
206	206
207	207	// * Draft method, defined for internal use only *
208	208	// Get the message routing id, as a frame
209		CZMQ_EXPORT zframe_t *
	209	CZMQ_PRIVATE zframe_t *
210	210	zgossip_msg_routing_id (zgossip_msg_t *self);
211	211
212	212	// * Draft method, defined for internal use only *
213	213	// Set the message routing id from a frame
214		CZMQ_EXPORT void
	214	CZMQ_PRIVATE void
215	215	zgossip_msg_set_routing_id (zgossip_msg_t self, zframe_t routing_id);
216	216
217	217	// * Draft method, defined for internal use only *
218	218	// Get the zgossip_msg message id
219		CZMQ_EXPORT int
	219	CZMQ_PRIVATE int
220	220	zgossip_msg_id (zgossip_msg_t *self);
221	221
222	222	// * Draft method, defined for internal use only *
223	223	// Set the zgossip_msg message id
224		CZMQ_EXPORT void
	224	CZMQ_PRIVATE void
225	225	zgossip_msg_set_id (zgossip_msg_t *self, int id);
226	226
227	227	// * Draft method, defined for internal use only *
228	228	// Get the zgossip_msg message id as printable text
229		CZMQ_EXPORT const char *
	229	CZMQ_PRIVATE const char *
230	230	zgossip_msg_command (zgossip_msg_t *self);
231	231
232	232	// * Draft method, defined for internal use only *
233	233	// Get the key field
234		CZMQ_EXPORT const char *
	234	CZMQ_PRIVATE const char *
235	235	zgossip_msg_key (zgossip_msg_t *self);
236	236
237	237	// * Draft method, defined for internal use only *
238	238	// Set the key field
239		CZMQ_EXPORT void
	239	CZMQ_PRIVATE void
240	240	zgossip_msg_set_key (zgossip_msg_t self, const char key);
241	241
242	242	// * Draft method, defined for internal use only *
243	243	// Get the value field
244		CZMQ_EXPORT const char *
	244	CZMQ_PRIVATE const char *
245	245	zgossip_msg_value (zgossip_msg_t *self);
246	246
247	247	// * Draft method, defined for internal use only *
248	248	// Set the value field
249		CZMQ_EXPORT void
	249	CZMQ_PRIVATE void
250	250	zgossip_msg_set_value (zgossip_msg_t self, const char value);
251	251
252	252	// * Draft method, defined for internal use only *
253	253	// Get the ttl field
254		CZMQ_EXPORT uint32_t
	254	CZMQ_PRIVATE uint32_t
255	255	zgossip_msg_ttl (zgossip_msg_t *self);
256	256
257	257	// * Draft method, defined for internal use only *
258	258	// Set the ttl field
259		CZMQ_EXPORT void
	259	CZMQ_PRIVATE void
260	260	zgossip_msg_set_ttl (zgossip_msg_t *self, uint32_t ttl);
261	261
262	262	// * Draft method, defined for internal use only *
263	263	// Self test of this class.
264		CZMQ_EXPORT void
	264	CZMQ_PRIVATE void
265	265	zgossip_msg_test (bool verbose);
266	266
267	267	#endif // CZMQ_BUILD_DRAFT_API

-1

src/czmq_selftest.c less more

57	57	{ "zproxy", zproxy_test },
58	58	{ "zrex", zrex_test },
59	59	{ "zsys", zsys_test },
60		{ "zgossip_msg", zgossip_msg_test },
61	60	#ifdef CZMQ_BUILD_DRAFT_API
62	61	{ "zproc", zproc_test },
63	62	{ "ztimerset", ztimerset_test },

-4

src/platform.h less more

173	173	#define PACKAGE_NAME "czmq"
174	174
175	175	/* Define to the full name and version of this package. */
176		#define PACKAGE_STRING "czmq 4.0.0"
	176	#define PACKAGE_STRING "czmq 4.0.1"
177	177
178	178	/* Define to the one symbol short name of this package. */
179	179	#define PACKAGE_TARNAME "czmq"

182	182	#define PACKAGE_URL ""
183	183
184	184	/* Define to the version of this package. */
185		#define PACKAGE_VERSION "4.0.0"
	185	#define PACKAGE_VERSION "4.0.1"
186	186
187	187	/* CZMQ major version */
188	188	#define PACKAGE_VERSION_MAJOR 4

191	191	#define PACKAGE_VERSION_MINOR 0
192	192
193	193	/* CZMQ patchlevel */
194		#define PACKAGE_VERSION_PATCH 0
	194	#define PACKAGE_VERSION_PATCH 1
195	195
196	196	/* Define as the return type of signal handlers (`int' or `void'). */
197	197	#define RETSIGTYPE void

203	203	#define TIME_WITH_SYS_TIME 1
204	204
205	205	/* Version number of package */
206		#define VERSION "4.0.0"
	206	#define VERSION "4.0.1"
207	207
208	208	/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
209	209	significant byte first (like Motorola and SPARC, unlike Intel). */

-0

src/zbeacon.c less more

157	157	zsys_info ("zbeacon: configured, hostname=%s", self->hostname);
158	158	}
159	159	}
	160	else
	161	{
	162	// No valid interface. Close the socket so that we can try again later
	163	zsys_udp_close(self->udpsock);
	164	self->udpsock = INVALID_SOCKET;
	165	}
160	166	}
161	167
162	168

-1

src/zgossip.c less more

481	481
482	482	// @end
483	483	printf ("OK\n");
484		}
	484
	485	// zgossip_msg is a private class used by zgossip, so we run the test here
	486	zgossip_msg_test (verbose);
	487	}