DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Give have_allow_ip() a chance to allow IPv6

Browse Source 
This greatly loosens the check for a valid IPv4/IPv6 there - but it is
redundant anyway, since there is always a call to is_valid_ip_addr().
This commit is contained in:
khorben
2018-08-20 11:02:14 +02:00
parent aea56f54c4
commit f7b18d64f3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/fko_message.c
+6 -6
View File
@@ -35,7 +35,7 @@ static int
have_allow_ip(const char *msg)
{
const char *ndx = msg;
char ip_str[MAX_IPV4_STR_LEN];
char ip_str[MAX_IPV46_STR_LEN];
int dot_ctr = 0, char_ctr = 0;
int res = FKO_SUCCESS;
@@ -43,14 +43,14 @@ have_allow_ip(const char *msg)
{
ip_str[char_ctr] = *ndx;
char_ctr++;
if(char_ctr >= MAX_IPV4_STR_LEN)
if(char_ctr >= sizeof(ip_str))
{
res = FKO_ERROR_INVALID_ALLOW_IP;
break;
}
if(*ndx == '.')
if(*ndx == '.' || *ndx == ':')
dot_ctr++;
else if(isdigit((int)(unsigned char)*ndx) == 0)
else if(isdigit((int)(unsigned char)*ndx) == 0 && !((*ndx >= 'a' && *ndx <= 'f') || (*ndx >= 'A' && *ndx <= 'F')))
{
res = FKO_ERROR_INVALID_ALLOW_IP;
break;
@@ -58,13 +58,13 @@ have_allow_ip(const char *msg)
ndx++;
}
if(char_ctr < MAX_IPV4_STR_LEN)
if(char_ctr < sizeof(ip_str))
ip_str[char_ctr] = '\0';
else
res = FKO_ERROR_INVALID_ALLOW_IP;
if(res == FKO_SUCCESS)
if (! is_valid_ip_addr(ip_str, strlen(ip_str), AF_INET))
if (! is_valid_ip_addr(ip_str, strlen(ip_str), AF_UNSPEC))
res = FKO_ERROR_INVALID_ALLOW_IP;
return(res);