generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-30 05:29:43 +01:00
Code Issues Projects Releases Wiki Activity

plain_mechanism now uses options.as_server

Browse Source 
- we need to switch to PLAIN according to options.mechanism
- we need to catch case when both peers are as-server (or neither is)
- and to use username/password from options, for client
This commit is contained in:
Pieter Hintjens
2013-05-17 17:46:30 +02:00
parent da1e9a178a
commit f909b9c722
11 changed files with 141 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/options.cpp
View File

@@ -52,7 +52,7 @@ zmq::options_t::options_t () :
tcp_keepalive_idle (-1),
tcp_keepalive_intvl (-1),
mechanism (ZMQ_NULL),
plain_server (0),
as_server (0),
socket_id (0)
{
}
@@ -251,7 +251,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
case ZMQ_PLAIN_SERVER:
if (is_int && (value == 0 || value == 1)) {
plain_server = value;
as_server = value;
mechanism = value? ZMQ_PLAIN: ZMQ_NULL;
return 0;
}
@@ -265,7 +265,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
else
if (optvallen_ >= 0 && optvallen_ < 256 && optval_ != NULL) {
plain_username.assign ((const char *) optval_, optvallen_);
plain_server = false;
as_server = 0;
mechanism = ZMQ_PLAIN;
return 0;
}
@@ -279,7 +279,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
else
if (optvallen_ >= 0 && optvallen_ < 256 && optval_ != NULL) {
plain_password.assign ((const char *) optval_, optvallen_);
plain_server = false;
as_server = 0;
mechanism = ZMQ_PLAIN;
return 0;
}
@@ -485,7 +485,7 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
case ZMQ_PLAIN_SERVER:
if (is_int) {
*value = plain_server;
*value = as_server && mechanism == ZMQ_PLAIN;
return 0;
}
break;