- insp_aton(resolved_addr,&addy);
- log(DEFAULT,"Resolved binding '%s' -> '%s'",addr,resolved_addr);
-#ifdef IPV6
- /* Todo: Deal with resolution of IPV6 */
- server.sin6_addr = addy;
-#else
- server.sin_addr = addy;
+ /* Zero out the location of the @ symbol */
+ *username_mask_pos = *username_addr_pos = 0;
+
+ /* Try and match() the strings before the @
+ * symbols, and recursively call MatchCIDR without
+ * username matching enabled to match the host part.
+ */
+ bool result = (match(address_dupe, cidr_dupe) && MatchCIDR(username_addr_pos + 1, username_mask_pos + 1, false));
+
+ /* Free the stuff we created */
+ free(address_dupe);
+ free(cidr_dupe);
+
+ /* Return a result */
+ return result;
+ }
+ else
+ {
+ /* One or both didnt have an @ in,
+ * just match as CIDR
+ */
+ free(address_dupe);
+ free(cidr_dupe);
+ mask = strdup(cidr_mask);
+ }
+ }
+ else
+ {
+ /* Make a copy of the cidr mask string,
+ * we're going to change it
+ */
+ mask = strdup(cidr_mask);
+ }
+
+ in_addr address_in4;
+ in_addr mask_in4;
+
+
+ /* Use strrchr for this, its nearer to the right */
+ char* bits_chars = strrchr(mask,'/');
+
+ if (bits_chars)
+ {
+ bits = atoi(bits_chars + 1);
+ *bits_chars = 0;
+ }
+ else
+ {
+ /* No 'number of bits' field! */
+ return false;
+ }
+
+#ifdef SUPPORT_IP6LINKS
+ in6_addr address_in6;
+ in6_addr mask_in6;
+
+ if (inet_pton(AF_INET6, address, &address_in6) > 0)
+ {
+ if (inet_pton(AF_INET6, mask, &mask_in6) > 0)
+ {
+ memcpy(&addr_raw, &address_in6.s6_addr, 16);
+ memcpy(&mask_raw, &mask_in6.s6_addr, 16);
+
+ if (bits > 128)
+ bits = 128;
+ }
+ else
+ {
+ /* The address was valid ipv6, but the mask
+ * that goes with it wasnt.
+ */
+ free(mask);
+ return false;
+ }
+ }
+ else