3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00
Code Issues Projects Releases Wiki Activity

Problem: Magic numbers "32" and "128" in tcp_address.cpp

Browse Source 
Solution: introduced constants
This commit is contained in:
Simon Giesecke 2018-05-28 09:58:39 +02:00
parent 93e75fd695
commit a6060674b4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tcp_address.cpp
View File

@ -48,6 +48,8 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include <limits.h>
zmq::tcp_address_t::tcp_address_t () : _has_src_addr (false) zmq::tcp_address_t::tcp_address_t () : _has_src_addr (false)
{ {
memset (&_address, 0, sizeof (_address)); memset (&_address, 0, sizeof (_address));
@ -227,17 +229,18 @@ int zmq::tcp_address_mask_t::resolve (const char *name_, bool ipv6_)
return rc; return rc;
// Parse the cidr mask number. // Parse the cidr mask number.
const int full_mask_ipv4 = sizeof (_address.ipv4.sin_addr) * CHAR_BIT;
const int full_mask_ipv6 = sizeof (_address.ipv6.sin6_addr) * CHAR_BIT;
if (mask_str.empty ()) { if (mask_str.empty ()) {
if (_address.family () == AF_INET6) _address_mask =
_address_mask = 128; _address.family () == AF_INET6 ? full_mask_ipv6 : full_mask_ipv4;
else
_address_mask = 32;
} else if (mask_str == "0") } else if (mask_str == "0")
_address_mask = 0; _address_mask = 0;
else { else {
const int mask = atoi (mask_str.c_str ()); const int mask = atoi (mask_str.c_str ());
if ((mask < 1) || (_address.family () == AF_INET6 && mask > 128) if ((mask < 1)
|| (_address.family () != AF_INET6 && mask > 32)) { || (_address.family () == AF_INET6 && mask > full_mask_ipv6)
|| (_address.family () != AF_INET6 && mask > full_mask_ipv4)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }