ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-31 05:10:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Just comments

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4743 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-08-06 19:03:14 +00:00
parent fcd863f3af
commit 4f68ff74b9
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/socket.cpp
View File

@ -64,6 +64,7 @@ bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mas
return true;
}
/* Match CIDR, but dont attempt to match() against leading *!*@ sections */
bool MatchCIDR(const char* address, const char* cidr_mask)
{
return MatchCIDR(address, cidr_mask, false);
@ -72,6 +73,9 @@ bool MatchCIDR(const char* address, const char* cidr_mask)
/* Match CIDR strings, e.g. 127.0.0.1 to 127.0.0.0/8 or 3ffe:1:5:6::8 to 3ffe:1::0/32
* If you have a lot of hosts to match, youre probably better off building your mask once
* and then using the lower level MatchCIDRBits directly.
*
* This will also attempt to match any leading usernames or nicknames on the mask, using
* match(), when match_with_username is true.
*/
bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username)
{
@ -94,19 +98,30 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
char* username_mask_pos = strchr(cidr_dupe, '@');
char* username_addr_pos = strchr(address_dupe, '@');
/* Both strings have an @ symbol in them */
if (username_mask_pos && username_addr_pos)
{
/* Zero out the location of the @ symbol */
*username_mask_pos = *username_addr_pos = 0;
bool result = (match(address_dupe, cidr_dupe) && MatchCIDR(username_addr_pos + 1, username_mask_pos + 1));
/* 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);
@ -114,6 +129,9 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
}
else
{
/* Make a copy of the cidr mask string,
* we're going to change it
*/
mask = strdup(cidr_mask);
}
@ -150,6 +168,9 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
}
else
{
/* The address was valid ipv6, but the mask
* that goes with it wasnt.
*/
free(mask);
return false;
}
@ -168,16 +189,21 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
}
else
{
/* The address was valid ipv4,
* but the mask that went with it wasnt.
*/
free(mask);
return false;
}
}
else
{
/* The address was neither ipv4 or ipv6 */
free(mask);
return false;
}
/* Low-level-match the bits in the raw data */
free(mask);
return MatchCIDRBits(addr_raw, mask_raw, bits);
}