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

Merge pull request #2649 from sigiesec/remove-property-literal-duplication

Browse Source 
Problem: Message property names are duplicated
This commit is contained in:
Luca Boccassi 2017-08-04 11:09:31 +01:00 committed by GitHub
commit b92dc0a674
11 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/zmq_msg_gets.txt
View File

@ -27,7 +27,6 @@ function:
Socket-Type Socket-Type
Identity Identity
Resource
Additionally, when available for the underlying transport, the *Peer-Address* Additionally, when available for the underlying transport, the *Peer-Address*
property will return the IP address of the remote endpoint as returned by property will return the IP address of the remote endpoint as returned by

6
include/zmq.h
View File

@ -584,6 +584,12 @@ ZMQ_EXPORT uint32_t zmq_msg_routing_id(zmq_msg_t *msg);
ZMQ_EXPORT int zmq_msg_set_group(zmq_msg_t *msg, const char *group); ZMQ_EXPORT int zmq_msg_set_group(zmq_msg_t *msg, const char *group);
ZMQ_EXPORT const char *zmq_msg_group(zmq_msg_t *msg); ZMQ_EXPORT const char *zmq_msg_group(zmq_msg_t *msg);
/* DRAFT Msg property names. */
#define ZMQ_MSG_PROPERTY_IDENTITY "Identity"
#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
/******************************************************************************/ /******************************************************************************/
/* Poller polling on sockets,fd and thread-safe sockets */ /* Poller polling on sockets,fd and thread-safe sockets */
/******************************************************************************/ /******************************************************************************/

6
src/curve_client.cpp
View File

@ -356,13 +356,15 @@ int zmq::curve_client_t::produce_initiate (msg_t *msg_)
// Add socket type property // Add socket type property
const char *socket_type = socket_type_string (options.type); const char *socket_type = socket_type_string (options.type);
ptr += add_property (ptr, "Socket-Type", socket_type, strlen (socket_type)); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_SOCKET_TYPE, socket_type,
strlen (socket_type));
// Add identity property // Add identity property
if (options.type == ZMQ_REQ if (options.type == ZMQ_REQ
|| options.type == ZMQ_DEALER || options.type == ZMQ_DEALER
|| options.type == ZMQ_ROUTER) || options.type == ZMQ_ROUTER)
ptr += add_property (ptr, "Identity", options.identity, options.identity_size); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_IDENTITY, options.identity,
options.identity_size);
const size_t mlen = ptr - initiate_plaintext; const size_t mlen = ptr - initiate_plaintext;

6
src/curve_server.cpp
View File

@ -534,13 +534,15 @@ int zmq::curve_server_t::produce_ready (msg_t *msg_)
// Add socket type property // Add socket type property
const char *socket_type = socket_type_string (options.type); const char *socket_type = socket_type_string (options.type);
ptr += add_property (ptr, "Socket-Type", socket_type, strlen (socket_type)); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_SOCKET_TYPE, socket_type,
strlen (socket_type));
// Add identity property // Add identity property
if (options.type == ZMQ_REQ if (options.type == ZMQ_REQ
|| options.type == ZMQ_DEALER || options.type == ZMQ_DEALER
|| options.type == ZMQ_ROUTER) || options.type == ZMQ_ROUTER)
ptr += add_property (ptr, "Identity", options.identity, options.identity_size); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_IDENTITY, options.identity,
options.identity_size);
const size_t mlen = ptr - ready_plaintext; const size_t mlen = ptr - ready_plaintext;

6
src/gssapi_mechanism_base.cpp
View File

@ -281,13 +281,15 @@ int zmq::gssapi_mechanism_base_t::produce_ready (msg_t *msg_)
// Add socket type property // Add socket type property
const char *socket_type = socket_type_string (options.type); const char *socket_type = socket_type_string (options.type);
ptr += add_property (ptr, "Socket-Type", socket_type, strlen (socket_type)); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_SOCKET_TYPE, socket_type,
strlen (socket_type));
// Add identity property // Add identity property
if (options.type == ZMQ_REQ if (options.type == ZMQ_REQ
|| options.type == ZMQ_DEALER || options.type == ZMQ_DEALER
|| options.type == ZMQ_ROUTER) || options.type == ZMQ_ROUTER)
ptr += add_property (ptr, "Identity", options.identity, options.identity_size); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_IDENTITY, options.identity,
options.identity_size);
const size_t command_size = ptr - command_buffer; const size_t command_size = ptr - command_buffer;
const int rc = msg_->init_size (command_size); const int rc = msg_->init_size (command_size);

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_) void zmq::mechanism_t::set_user_id (const void *data_, size_t size_)
{ {
user_id = blob_t (static_cast <const unsigned char*> (data_), size_); user_id = blob_t (static_cast <const unsigned char*> (data_), size_);
zap_properties.insert ( zap_properties.insert (metadata_t::dict_t::value_type (
metadata_t::dict_t::value_type ( ZMQ_MSG_PROPERTY_USER_ID, std::string ((char *) data_, size_)));
"User-Id", std::string ((char *) data_, size_)));
} }
zmq::blob_t zmq::mechanism_t::get_user_id () const 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; ptr_ += value_length;
bytes_left -= 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); set_peer_identity (value, value_length);
else else
if (name == "Socket-Type") { if (name == ZMQ_MSG_PROPERTY_SOCKET_TYPE) {
const std::string socket_type ((char *) value, value_length); const std::string socket_type ((char *) value, value_length);
if (!check_socket_type (socket_type)) { if (!check_socket_type (socket_type)) {
errno = EINVAL; errno = EINVAL;

6
src/null_mechanism.cpp
View File

@ -109,13 +109,15 @@ int zmq::null_mechanism_t::next_handshake_command (msg_t *msg_)
// Add socket type property // Add socket type property
const char *socket_type = socket_type_string (options.type); const char *socket_type = socket_type_string (options.type);
ptr += add_property (ptr, "Socket-Type", socket_type, strlen (socket_type)); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_SOCKET_TYPE, socket_type,
strlen (socket_type));
// Add identity property // Add identity property
if (options.type == ZMQ_REQ if (options.type == ZMQ_REQ
|| options.type == ZMQ_DEALER || options.type == ZMQ_DEALER
|| options.type == ZMQ_ROUTER) || options.type == ZMQ_ROUTER)
ptr += add_property (ptr, "Identity", options.identity, options.identity_size); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_IDENTITY, options.identity,
options.identity_size);
const size_t command_size = ptr - command_buffer; const size_t command_size = ptr - command_buffer;
const int rc = msg_->init_size (command_size); const int rc = msg_->init_size (command_size);

7
src/plain_client.cpp
View File

@ -170,14 +170,15 @@ int zmq::plain_client_t::produce_initiate (msg_t *msg_) const
// Add socket type property // Add socket type property
const char *socket_type = socket_type_string (options.type); const char *socket_type = socket_type_string (options.type);
ptr += add_property (ptr, "Socket-Type", socket_type, strlen (socket_type)); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_SOCKET_TYPE, socket_type,
strlen (socket_type));
// Add identity property // Add identity property
if (options.type == ZMQ_REQ if (options.type == ZMQ_REQ
|| options.type == ZMQ_DEALER || options.type == ZMQ_DEALER
|| options.type == ZMQ_ROUTER) || options.type == ZMQ_ROUTER)
ptr += add_property ( ptr += add_property (ptr, ZMQ_MSG_PROPERTY_IDENTITY, options.identity,
ptr, "Identity", options.identity, options.identity_size); options.identity_size);
const size_t command_size = ptr - command_buffer; const size_t command_size = ptr - command_buffer;
const int rc = msg_->init_size (command_size); const int rc = msg_->init_size (command_size);

7
src/plain_server.cpp
View File

@ -250,14 +250,15 @@ int zmq::plain_server_t::produce_ready (msg_t *msg_) const
// Add socket type property // Add socket type property
const char *socket_type = socket_type_string (options.type); const char *socket_type = socket_type_string (options.type);
ptr += add_property (ptr, "Socket-Type", socket_type, strlen (socket_type)); ptr += add_property (ptr, ZMQ_MSG_PROPERTY_SOCKET_TYPE, socket_type,
strlen (socket_type));
// Add identity property // Add identity property
if (options.type == ZMQ_REQ if (options.type == ZMQ_REQ
|| options.type == ZMQ_DEALER || options.type == ZMQ_DEALER
|| options.type == ZMQ_ROUTER) || options.type == ZMQ_ROUTER)
ptr += add_property ( ptr += add_property (ptr, ZMQ_MSG_PROPERTY_IDENTITY, options.identity,
ptr, "Identity", options.identity, options.identity_size); options.identity_size);
const size_t command_size = ptr - command_buffer; const size_t command_size = ptr - command_buffer;
const int rc = msg_->init_size (command_size); const int rc = msg_->init_size (command_size);

3
src/stream_engine.cpp
View File

@ -1023,7 +1023,8 @@ void zmq::stream_engine_t::set_handshake_timer ()
bool zmq::stream_engine_t::init_properties (properties_t & properties) { bool zmq::stream_engine_t::init_properties (properties_t & properties) {
if (peer_address.empty()) return false; if (peer_address.empty()) return false;
properties.insert (std::make_pair("Peer-Address", peer_address)); properties.insert (
std::make_pair (ZMQ_MSG_PROPERTY_PEER_ADDRESS, peer_address));
// Private property to support deprecated SRCFD // Private property to support deprecated SRCFD
std::ostringstream stream; std::ostringstream stream;

6
src/zmq_draft.h
View File

@ -69,6 +69,12 @@ uint32_t zmq_msg_routing_id(zmq_msg_t *msg);
int zmq_msg_set_group(zmq_msg_t *msg, const char *group); int zmq_msg_set_group(zmq_msg_t *msg, const char *group);
const char *zmq_msg_group(zmq_msg_t *msg); const char *zmq_msg_group(zmq_msg_t *msg);
/* DRAFT Msg property names. */
#define ZMQ_MSG_PROPERTY_IDENTITY "Identity"
#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
/******************************************************************************/ /******************************************************************************/
/* Poller polling on sockets,fd and thread-safe sockets */ /* Poller polling on sockets,fd and thread-safe sockets */
/******************************************************************************/ /******************************************************************************/