generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-28 03:20:13 +01:00
Code Issues Projects Releases Wiki Activity

ZMQ_SNDBUF and ZMQ_RCVBUF type changed to int

Browse Source 
This mimics POSIX specification.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik
2011-03-24 14:48:50 +01:00
parent a2252de2bc
commit 17e82a3611
6 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/options.cpp
View File

@@ -87,7 +87,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0;
case ZMQ_RECOVERY_IVL:
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
errno = EINVAL;
return -1;
}
@@ -95,19 +95,19 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0;
case ZMQ_SNDBUF:
if (optvallen_ != sizeof (uint64_t)) {
if (optvallen_ != sizeof (int) || *((int*) optval_) < 0) {
errno = EINVAL;
return -1;
}
sndbuf = *((uint64_t*) optval_);
sndbuf = *((int*) optval_);
return 0;
case ZMQ_RCVBUF:
if (optvallen_ != sizeof (uint64_t)) {
if (optvallen_ != sizeof (int) || *((int*) optval_) < 0) {
errno = EINVAL;
return -1;
}
rcvbuf = *((uint64_t*) optval_);
rcvbuf = *((int*) optval_);
return 0;
case ZMQ_LINGER:
@@ -215,21 +215,21 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
return 0;
case ZMQ_SNDBUF:
if (*optvallen_ < sizeof (uint64_t)) {
if (*optvallen_ < sizeof (int)) {
errno = EINVAL;
return -1;
}
*((uint64_t*) optval_) = sndbuf;
*optvallen_ = sizeof (uint64_t);
*((int*) optval_) = sndbuf;
*optvallen_ = sizeof (int);
return 0;
case ZMQ_RCVBUF:
if (*optvallen_ < sizeof (uint64_t)) {
if (*optvallen_ < sizeof (int)) {
errno = EINVAL;
return -1;
}
*((uint64_t*) optval_) = rcvbuf;
*optvallen_ = sizeof (uint64_t);
*((int*) optval_) = rcvbuf;
*optvallen_ = sizeof (int);
return 0;
case ZMQ_TYPE: