Merge pull request #53 from rikvdh/master

Fix issue #52, reset all bits in getsockopt
This commit is contained in:
Constantin Rack 2015-08-01 10:55:15 +02:00
commit 74fe8b6125
5 changed files with 77 additions and 0 deletions

View File

@ -324,6 +324,7 @@ test_apps = \
test_proxy \
test_proxy_single_socket \
test_proxy_terminate \
test_getsockopt_memset \
test_many_sockets \
test_ipc_wildcard \
test_diffserv \
@ -482,6 +483,9 @@ test_proxy_single_socket_LDADD = libzmq.la
test_proxy_terminate_SOURCES = tests/test_proxy_terminate.cpp
test_proxy_terminate_LDADD = libzmq.la
test_getsockopt_memset_SOURCES = tests/test_getsockopt_memset.cpp
test_getsockopt_memset_LDADD = libzmq.la
test_many_sockets_SOURCES = tests/test_many_sockets.cpp
test_many_sockets_LDADD = libzmq.la

2
NEWS
View File

@ -1,6 +1,8 @@
0MQ version 4.1.3 stable, released on 2015/xx/xx
================================================
* Fixed #52 - getsockopt ZMQ_RCVMORE now resets all bits instead of only 32
* Fixed validation of IPv6 addresses with brackets
0MQ version 4.1.2 stable, released on 2015/06/15

View File

@ -304,6 +304,7 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_,
errno = EINVAL;
return -1;
}
memset(optval_, 0, *optvallen_);
*((int*) optval_) = rcvmore ? 1 : 0;
*optvallen_ = sizeof (int);
return 0;

View File

@ -56,6 +56,7 @@ if(NOT WIN32)
test_proxy
test_proxy_single_socket
test_proxy_terminate
test_getsockopt_memset
test_filter_ipc
)
if(HAVE_FORK)

View File

@ -0,0 +1,69 @@
/*
Copyright (c) 2007-2015 Contributors as noted in the AUTHORS file
This file is part of libzmq, the ZeroMQ core engine in C++.
libzmq is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License (LGPL) as published
by the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
As a special exception, the Contributors give you permission to link
this library with independent modules to produce an executable,
regardless of the license terms of these independent modules, and to
copy and distribute the resulting executable under terms of your choice,
provided that you also meet, for each linked independent module, the
terms and conditions of the license of that module. An independent
module is a module which is not derived from or based on this library.
If you modify this library, you must extend this exception to your
version of the library.
libzmq is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
int main (void)
{
int64_t more;
size_t more_size = sizeof(more);
setup_test_environment();
void *ctx = zmq_ctx_new ();
assert (ctx);
void *sb = zmq_socket (ctx, ZMQ_PUB);
assert (sb);
int rc = zmq_bind (sb, "inproc://a");
assert (rc == 0);
void *sc = zmq_socket (ctx, ZMQ_SUB);
assert (sc);
rc = zmq_connect (sc, "inproc://a");
assert (rc == 0);
memset(&more, 0xFF, sizeof(int64_t));
zmq_getsockopt(sc, ZMQ_RCVMORE, &more, &more_size);
assert (more_size == sizeof(int));
assert (more == 0);
// Cleanup
rc = zmq_close (sc);
assert (rc == 0);
rc = zmq_close (sb);
assert (rc == 0);
rc = zmq_ctx_term (ctx);
assert (rc == 0);
return 0 ;
}