Merge pull request #312 from shripchenko/master

some spaces cleanups + delete unused anymore zmq::max_sockets + some minor code chages

src/config.hpp

@@ -29,9 +29,6 @@ namespace zmq
 
     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%

src/ip.cpp

@@ -179,4 +179,3 @@ void zmq::enable_ipv4_mapping (fd_t s_)
 #endif
 #endif
 }
-

src/tcp_address.cpp

@@ -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;

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:
 

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;
 }
-