3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-19 18:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #995 from hintjens/master

Browse Source 
Bumped ABI version to 4.0.0
This commit is contained in:
Ian Barber 2014-05-01 15:23:10 +01:00
commit 62bb403eea
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -90,6 +90,7 @@ tests/test_connect_rid
tests/test_srcfd tests/test_srcfd
tests/test_stream_disconnect tests/test_stream_disconnect
tests/test_proxy_chain tests/test_proxy_chain
tests/test_bind_src_address
tests/test*.log tests/test*.log
tests/test*.trs tests/test*.trs
src/platform.hpp* src/platform.hpp*

4
configure.ac
View File

@ -29,10 +29,10 @@ AC_SUBST(PACKAGE_VERSION)
# ZeroMQ versions 2.1.x: 1:0:0 (ABI version 1) # ZeroMQ versions 2.1.x: 1:0:0 (ABI version 1)
# ZeroMQ version 3.0: 2:0:0 (ABI version 2) # ZeroMQ version 3.0: 2:0:0 (ABI version 2)
# ZeroMQ version 3.1: 3:0:0 (ABI version 3) # ZeroMQ version 3.1: 3:0:0 (ABI version 3)
# ZeroMQ version 4.0: 4:0:1 (ABI version 4) # ZeroMQ version 4.0: 4:0:0 (ABI version 4)
# #
# libzmq -version-info current:revision:age # libzmq -version-info current:revision:age
LTVER="4:0:1" LTVER="4:0:0"
AC_SUBST(LTVER) AC_SUBST(LTVER)
# Take a copy of original flags # Take a copy of original flags

4
tests/test_proxy.cpp
View File

@ -61,7 +61,7 @@ client_task (void *ctx)
sprintf (identity, "%04X-%04X", rand() % 0xFFFF, rand() % 0xFFFF); sprintf (identity, "%04X-%04X", rand() % 0xFFFF, rand() % 0xFFFF);
rc = zmq_setsockopt (client, ZMQ_IDENTITY, identity, ID_SIZE); // includes '\0' as an helper for printf rc = zmq_setsockopt (client, ZMQ_IDENTITY, identity, ID_SIZE); // includes '\0' as an helper for printf
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (client, "tcp://127.0.0.1:9999"); rc = zmq_connect (client, "tcp://127.0.0.1:5563");
assert (rc == 0); assert (rc == 0);
zmq_pollitem_t items [] = { { client, 0, ZMQ_POLLIN, 0 }, { control, 0, ZMQ_POLLIN, 0 } }; zmq_pollitem_t items [] = { { client, 0, ZMQ_POLLIN, 0 }, { control, 0, ZMQ_POLLIN, 0 } };
@ -118,7 +118,7 @@ server_task (void *ctx)
// Frontend socket talks to clients over TCP // Frontend socket talks to clients over TCP
void *frontend = zmq_socket (ctx, ZMQ_ROUTER); void *frontend = zmq_socket (ctx, ZMQ_ROUTER);
assert (frontend); assert (frontend);
int rc = zmq_bind (frontend, "tcp://127.0.0.1:9999"); int rc = zmq_bind (frontend, "tcp://127.0.0.1:5563");
assert (rc == 0); assert (rc == 0);
// Backend socket talks to workers over inproc // Backend socket talks to workers over inproc