generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-14 19:13:52 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sergey KHripchenko 2012-04-13 13:26:57 +04:00
parent acba6bdd6c
commit c77dc98b5c
8 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.hpp
View File

@ -29,9 +29,6 @@ namespace zmq
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 // Number of new messages in message pipe needed to trigger new memory
// allocation. Setting this parameter to 256 decreases the impact of // allocation. Setting this parameter to 256 decreases the impact of
// memory allocation by approximately 99.6% // memory allocation by approximately 99.6%

11
src/ip.cpp
View File

@ -150,14 +150,14 @@ void zmq::unblock_socket (fd_t s_)
int rc = ioctlsocket (s_, FIONBIO, &nonblock); int rc = ioctlsocket (s_, FIONBIO, &nonblock);
wsa_assert (rc != SOCKET_ERROR); wsa_assert (rc != SOCKET_ERROR);
#elif ZMQ_HAVE_OPENVMS #elif ZMQ_HAVE_OPENVMS
int nonblock = 1; int nonblock = 1;
int rc = ioctl (s_, FIONBIO, &nonblock); int rc = ioctl (s_, FIONBIO, &nonblock);
errno_assert (rc != -1); errno_assert (rc != -1);
#else #else
int flags = fcntl (s_, F_GETFL, 0); int flags = fcntl (s_, F_GETFL, 0);
if (flags == -1) if (flags == -1)
flags = 0; flags = 0;
int rc = fcntl (s_, F_SETFL, flags | O_NONBLOCK); int rc = fcntl (s_, F_SETFL, flags | O_NONBLOCK);
errno_assert (rc != -1); errno_assert (rc != -1);
#endif #endif
} }
@ -179,4 +179,3 @@ void zmq::enable_ipv4_mapping (fd_t s_)
#endif #endif
#endif #endif
} }

20
src/tcp_address.cpp
View File

@ -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_) 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. // 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. // 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_, '/'); const char *delimiter = strrchr (name_, '/');
if (delimiter != NULL) { if (delimiter != NULL) {
addr_str.assign (name_, delimiter - name_); addr_str.assign (name_, delimiter - name_);
@ -508,26 +506,26 @@ int zmq::tcp_address_mask_t::resolve (const char *name_, bool ipv4only_)
return 0; 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) if (ss->sa_family != address.generic.sa_family)
return false; return false;
if (address_mask > 0) { if (address_mask > 0) {
int mask; int mask;
const int8_t *our_bytes, *their_bytes; const uint8_t *our_bytes, *their_bytes;
if (ss->sa_family == AF_INET6) { if (ss->sa_family == AF_INET6) {
zmq_assert (ss_len == sizeof (struct sockaddr_in6)); zmq_assert (ss_len == sizeof (struct sockaddr_in6));
their_bytes = (const int8_t *) &(((const struct sockaddr_in6 *) ss)->sin6_addr); their_bytes = (const uint8_t *) &(((const struct sockaddr_in6 *) ss)->sin6_addr);
our_bytes = (const int8_t *) &address.ipv6.sin6_addr; our_bytes = (const uint8_t *) &address.ipv6.sin6_addr;
mask = sizeof (struct in6_addr) * 8; mask = sizeof (struct in6_addr) * 8;
} }
else { else {
zmq_assert (ss_len == sizeof (struct sockaddr_in)); zmq_assert (ss_len == sizeof (struct sockaddr_in));
their_bytes = (const int8_t *) &(((const struct sockaddr_in *) ss)->sin_addr); their_bytes = (const uint8_t *) &(((const struct sockaddr_in *) ss)->sin_addr);
our_bytes = (const int8_t *) &address.ipv4.sin_addr; our_bytes = (const uint8_t *) &address.ipv4.sin_addr;
mask = sizeof (struct in_addr) * 8; mask = sizeof (struct in_addr) * 8;
} }
if (address_mask < mask) mask = address_mask; 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; 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 (last_byte_bits) {
if ((their_bytes[full_bytes] & last_byte_bits) != (our_bytes[full_bytes] & last_byte_bits)) if ((their_bytes[full_bytes] & last_byte_bits) != (our_bytes[full_bytes] & last_byte_bits))
return false; return false;

2
src/tcp_address.hpp
View File

@ -81,7 +81,7 @@ namespace zmq
const int mask () const; 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: private:

2
src/tcp_listener.cpp
View File

@ -257,7 +257,6 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
if (!options.tcp_accept_filters.empty ()) { if (!options.tcp_accept_filters.empty ()) {
bool matched = false; bool matched = false;
//ss_len = 1;
for (options_t::tcp_accept_filters_t::size_type i = 0; i != options.tcp_accept_filters.size (); ++i) { 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)) { if (options.tcp_accept_filters[i].match_address ((struct sockaddr *) &ss, ss_len)) {
matched = true; matched = true;
@ -278,4 +277,3 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
return sock; return sock;
} }