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

Problem: Property names are duplicated at several places

Browse Source 
Solution: Define them in zmq.h and use them (currently in DRAFT API)
This commit is contained in:
Simon Giesecke
2017-08-04 10:33:51 +02:00
parent c191909c0e
commit 9949965717
10 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mechanism.cpp
View File

@@ -61,9 +61,8 @@ void zmq::mechanism_t::peer_identity (msg_t *msg_)
void zmq::mechanism_t::set_user_id (const void *data_, size_t size_)
{
user_id = blob_t (static_cast <const unsigned char*> (data_), size_);
zap_properties.insert (
metadata_t::dict_t::value_type (
"User-Id", std::string ((char *) data_, size_)));
zap_properties.insert (metadata_t::dict_t::value_type (
ZMQ_MSG_PROPERTY_USER_ID, std::string ((char *) data_, size_)));
}
zmq::blob_t zmq::mechanism_t::get_user_id () const
@@ -127,10 +126,10 @@ int zmq::mechanism_t::parse_metadata (const unsigned char *ptr_,
ptr_ += value_length;
bytes_left -= value_length;
if (name == "Identity" && options.recv_identity)
if (name == ZMQ_MSG_PROPERTY_IDENTITY && options.recv_identity)
set_peer_identity (value, value_length);
else
if (name == "Socket-Type") {
if (name == ZMQ_MSG_PROPERTY_SOCKET_TYPE) {
const std::string socket_type ((char *) value, value_length);
if (!check_socket_type (socket_type)) {
errno = EINVAL;