From c77dc98b5c83dcaa5ab4ecfff8f786a1cf7b2e5c Mon Sep 17 00:00:00 2001 From: Sergey KHripchenko Date: Fri, 13 Apr 2012 13:26:57 +0400 Subject: [PATCH] some spaces cleanups + delete unused anymore zmq::max_sockets + some minor code chages --- src/config.hpp | 5 +---- src/ip.cpp | 11 +++++------ src/options.cpp | 4 ++-- src/options.hpp | 2 +- src/tcp_address.cpp | 28 +++++++++++++--------------- src/tcp_address.hpp | 2 +- src/tcp_listener.cpp | 2 -- src/tcp_listener.hpp | 2 +- 8 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/config.hpp b/src/config.hpp index f7b4c50e..1940572d 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -27,11 +27,8 @@ namespace zmq // Compile-time settings. - enum + enum { - // Maximum number of sockets that can be opened at the same time. - max_sockets = 512, - // Number of new messages in message pipe needed to trigger new memory // allocation. Setting this parameter to 256 decreases the impact of // memory allocation by approximately 99.6% diff --git a/src/ip.cpp b/src/ip.cpp index a6456e82..283eb6d8 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -150,14 +150,14 @@ void zmq::unblock_socket (fd_t s_) int rc = ioctlsocket (s_, FIONBIO, &nonblock); wsa_assert (rc != SOCKET_ERROR); #elif ZMQ_HAVE_OPENVMS - int nonblock = 1; - int rc = ioctl (s_, FIONBIO, &nonblock); + int nonblock = 1; + int rc = ioctl (s_, FIONBIO, &nonblock); errno_assert (rc != -1); #else - int flags = fcntl (s_, F_GETFL, 0); - if (flags == -1) + int flags = fcntl (s_, F_GETFL, 0); + if (flags == -1) flags = 0; - int rc = fcntl (s_, F_SETFL, flags | O_NONBLOCK); + int rc = fcntl (s_, F_SETFL, flags | O_NONBLOCK); errno_assert (rc != -1); #endif } @@ -179,4 +179,3 @@ void zmq::enable_ipv4_mapping (fd_t s_) #endif #endif } - diff --git a/src/options.cpp b/src/options.cpp index 3be8ba65..fdd5299d 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -107,7 +107,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_, } rate = *((int*) optval_); return 0; - + case ZMQ_RECOVERY_IVL: if (optvallen_ != sizeof (int) || *((int*) optval_) < 0) { errno = EINVAL; @@ -366,7 +366,7 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_) *((int*) optval_) = rate; *optvallen_ = sizeof (int); return 0; - + case ZMQ_RECOVERY_IVL: if (*optvallen_ < sizeof (int)) { errno = EINVAL; diff --git a/src/options.hpp b/src/options.hpp index 9f6658ed..80ca13dc 100644 --- a/src/options.hpp +++ b/src/options.hpp @@ -50,7 +50,7 @@ namespace zmq // Socket identity unsigned char identity_size; unsigned char identity [256]; - + // Last socket endpoint URI std::string last_endpoint; diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp index 6ec00e88..9b6b6447 100644 --- a/src/tcp_address.cpp +++ b/src/tcp_address.cpp @@ -72,7 +72,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv4only_) size_t ifr_size = sizeof (struct lifreq) * ifn.lifn_count; char *ifr = (char*) malloc (ifr_size); alloc_assert (ifr); - + // Retrieve interface names. lifconf ifc; ifc.lifc_family = AF_INET; @@ -145,7 +145,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv4only_) memcpy (&address.ipv4.sin_addr, &((sockaddr_in*) &ifr.ifr_addr)->sin_addr, sizeof (in_addr)); - return 0; + return 0; } #elif ((defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_FREEBSD ||\ @@ -358,9 +358,9 @@ int zmq::tcp_address_t::resolve_hostname (const char *hostname_, bool ipv4only_) // Copy first result to output addr with hostname and service. zmq_assert ((size_t) (res->ai_addrlen) <= sizeof (address)); memcpy (&address, res->ai_addr, res->ai_addrlen); - + freeaddrinfo (res); - + return 0; } @@ -458,11 +458,9 @@ const int zmq::tcp_address_mask_t::mask () const int zmq::tcp_address_mask_t::resolve (const char *name_, bool ipv4only_) { - std::string addr_str; - std::string mask_str; - // Find '/' at the end that separates address from the cidr mask number. // Allow empty mask clause and threat it like '/32' for ipv4 or '/128' for ipv6. + std::string addr_str, mask_str; const char *delimiter = strrchr (name_, '/'); if (delimiter != NULL) { addr_str.assign (name_, delimiter - name_); @@ -508,26 +506,26 @@ int zmq::tcp_address_mask_t::resolve (const char *name_, bool ipv4only_) return 0; } -const bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss, socklen_t ss_len) const +const bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss, const socklen_t ss_len) const { - zmq_assert (ss != NULL && ss_len >= sizeof(struct sockaddr)); + zmq_assert (address_mask != -1 && ss != NULL && ss_len >= sizeof(struct sockaddr)); if (ss->sa_family != address.generic.sa_family) return false; if (address_mask > 0) { int mask; - const int8_t *our_bytes, *their_bytes; + const uint8_t *our_bytes, *their_bytes; if (ss->sa_family == AF_INET6) { zmq_assert (ss_len == sizeof (struct sockaddr_in6)); - their_bytes = (const int8_t *) &(((const struct sockaddr_in6 *) ss)->sin6_addr); - our_bytes = (const int8_t *) &address.ipv6.sin6_addr; + their_bytes = (const uint8_t *) &(((const struct sockaddr_in6 *) ss)->sin6_addr); + our_bytes = (const uint8_t *) &address.ipv6.sin6_addr; mask = sizeof (struct in6_addr) * 8; } else { zmq_assert (ss_len == sizeof (struct sockaddr_in)); - their_bytes = (const int8_t *) &(((const struct sockaddr_in *) ss)->sin_addr); - our_bytes = (const int8_t *) &address.ipv4.sin_addr; + their_bytes = (const uint8_t *) &(((const struct sockaddr_in *) ss)->sin_addr); + our_bytes = (const uint8_t *) &address.ipv4.sin_addr; mask = sizeof (struct in_addr) * 8; } if (address_mask < mask) mask = address_mask; @@ -538,7 +536,7 @@ const bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss, so return false; } - int last_byte_bits = (0xffU << (8 - (mask % 8))) & 0xffU; + uint8_t last_byte_bits = (0xffU << (8 - (mask % 8))) & 0xffU; if (last_byte_bits) { if ((their_bytes[full_bytes] & last_byte_bits) != (our_bytes[full_bytes] & last_byte_bits)) return false; diff --git a/src/tcp_address.hpp b/src/tcp_address.hpp index 61067c84..604735ed 100644 --- a/src/tcp_address.hpp +++ b/src/tcp_address.hpp @@ -81,7 +81,7 @@ namespace zmq const int mask () const; - const bool match_address (const struct sockaddr *sa, socklen_t ss_len) const; + const bool match_address (const struct sockaddr *ss, const socklen_t ss_len) const; private: diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index 4f80add2..ee639ebe 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -257,7 +257,6 @@ zmq::fd_t zmq::tcp_listener_t::accept () if (!options.tcp_accept_filters.empty ()) { bool matched = false; -//ss_len = 1; for (options_t::tcp_accept_filters_t::size_type i = 0; i != options.tcp_accept_filters.size (); ++i) { if (options.tcp_accept_filters[i].match_address ((struct sockaddr *) &ss, ss_len)) { matched = true; @@ -278,4 +277,3 @@ zmq::fd_t zmq::tcp_listener_t::accept () return sock; } - diff --git a/src/tcp_listener.hpp b/src/tcp_listener.hpp index 2daa50b8..c3339e49 100644 --- a/src/tcp_listener.hpp +++ b/src/tcp_listener.hpp @@ -44,7 +44,7 @@ namespace zmq // Set address to listen on. int set_address (const char *addr_); - + // Get the bound address for use with wildcard int get_address (std::string &addr_);