extern ServerConfig* Config;
extern time_t TIME;
-/* Used when comparing CIDR masks for the modulus bits left over */
+/* Used when comparing CIDR masks for the modulus bits left over.
+ * A lot of ircd's seem to do this:
+ * ((-1) << (8 - (mask % 8)))
+ * But imho, it sucks in comparison to a nice neat lookup table.
+ */
const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used */
0x80, /* 10000000 - 1 bits */
0xC0, /* 11000000 - 2 bits */
unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */
unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */
- /* We shouldnt match anything, /0 is always valid */
- if (!mask_bits)
- return true;
-
/* First compare the whole bytes, if they dont match, return false */
if (memcmp(address, mask, divisor))
return false;
* of the @ symbol in each */
char* address_dupe = strdup(address);
char* cidr_dupe = strdup(cidr_mask);
-
- char* username_mask_pos = strchr(cidr_dupe, '@');
- char* username_addr_pos = strchr(address_dupe, '@');
+
+ /* Use strchr not strrchr, because its going to be nearer to the left */
+ char* username_mask_pos = strrchr(cidr_dupe, '@');
+ char* username_addr_pos = strrchr(address_dupe, '@');
/* Both strings have an @ symbol in them */
if (username_mask_pos && username_addr_pos)
in_addr mask_in4;
- char* bits_chars = strchr(mask,'/');
+ /* Use strrchr for this, its nearer to the right */
+ char* bits_chars = strrchr(mask,'/');
if (bits_chars)
{