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

Problem: stream_engine_t::_peer_address is unnecssarily non-const

Browse Source 
Solution: extract initialization code into get_peer_address function and declare _peer_address const
This commit is contained in:
Simon Giesecke
2019-01-31 07:17:18 -05:00
parent ae79b41d4c
commit 091df743a8
2 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/stream_engine.cpp
View File

@@ -63,6 +63,43 @@
#include "likely.hpp" #include "likely.hpp"
#include "wire.hpp" #include "wire.hpp"
static std::string get_peer_address (zmq::fd_t s_)
{
std::string peer_address;
const int family = zmq::get_peer_ip_address (s_, peer_address);
if (family == 0)
peer_address.clear ();
#if defined ZMQ_HAVE_SO_PEERCRED
else if (family == PF_UNIX) {
struct ucred cred;
socklen_t size = sizeof (cred);
if (!getsockopt (s_, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
std::ostringstream buf;
buf << ":" << cred.uid << ":" << cred.gid << ":" << cred.pid;
peer_address += buf.str ();
}
}
#elif defined ZMQ_HAVE_LOCAL_PEERCRED
else if (family == PF_UNIX) {
struct xucred cred;
socklen_t size = sizeof (cred);
if (!getsockopt (_s, 0, LOCAL_PEERCRED, &cred, &size)
&& cred.cr_version == XUCRED_VERSION) {
std::ostringstream buf;
buf << ":" << cred.cr_uid << ":";
if (cred.cr_ngroups > 0)
buf << cred.cr_groups[0];
buf << ":";
_peer_address += buf.str ();
}
}
#endif
return peer_address;
}
zmq::stream_engine_t::stream_engine_t (fd_t fd_, zmq::stream_engine_t::stream_engine_t (fd_t fd_,
const options_t &options_, const options_t &options_,
const std::string &endpoint_) : const std::string &endpoint_) :
@@ -94,7 +131,8 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_,
_has_timeout_timer (false), _has_timeout_timer (false),
_has_heartbeat_timer (false), _has_heartbeat_timer (false),
_heartbeat_timeout (0), _heartbeat_timeout (0),
_socket (NULL) _socket (NULL),
_peer_address (get_peer_address (_s))
{ {
int rc = _tx_msg.init (); int rc = _tx_msg.init ();
errno_assert (rc == 0); errno_assert (rc == 0);
@@ -104,34 +142,6 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_,
// Put the socket into non-blocking mode. // Put the socket into non-blocking mode.
unblock_socket (_s); unblock_socket (_s);
const int family = get_peer_ip_address (_s, _peer_address);
if (family == 0)
_peer_address.clear ();
#if defined ZMQ_HAVE_SO_PEERCRED
else if (family == PF_UNIX) {
struct ucred cred;
socklen_t size = sizeof (cred);
if (!getsockopt (_s, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
std::ostringstream buf;
buf << ":" << cred.uid << ":" << cred.gid << ":" << cred.pid;
_peer_address += buf.str ();
}
}
#elif defined ZMQ_HAVE_LOCAL_PEERCRED
else if (family == PF_UNIX) {
struct xucred cred;
socklen_t size = sizeof (cred);
if (!getsockopt (_s, 0, LOCAL_PEERCRED, &cred, &size)
&& cred.cr_version == XUCRED_VERSION) {
std::ostringstream buf;
buf << ":" << cred.cr_uid << ":";
if (cred.cr_ngroups > 0)
buf << cred.cr_groups[0];
buf << ":";
_peer_address += buf.str ();
}
}
#endif
if (_options.heartbeat_interval > 0) { if (_options.heartbeat_interval > 0) {
_heartbeat_timeout = _options.heartbeat_timeout; _heartbeat_timeout = _options.heartbeat_timeout;

2
src/stream_engine.hpp
View File

@@ -238,7 +238,7 @@ class stream_engine_t : public io_object_t, public i_engine
// Socket // Socket
zmq::socket_base_t *_socket; zmq::socket_base_t *_socket;
std::string _peer_address; const std::string _peer_address;
stream_engine_t (const stream_engine_t &); stream_engine_t (const stream_engine_t &);
const stream_engine_t &operator= (const stream_engine_t &); const stream_engine_t &operator= (const stream_engine_t &);