DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Migrate is_valid_ipv4_addr() to a more generic function

Browse Source 
It is now called is_valid_ip_addr() and expects an additional parameter
for the address family.
This commit is contained in:
Pierre Pronchery
2018-06-12 17:07:49 -04:00
parent a0dda67dfe
commit b3494dcfc1
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/incoming_spa.c
View File

@@ -119,7 +119,7 @@ preprocess_spa_data(const fko_srv_options_t *opts, spa_pkt_info_t *spa_pkt, spa_
xff -= i - 1;
if (!is_valid_ipv4_addr(xff, strlen(xff)))
if (!is_valid_ip_addr(xff, strlen(xff), AF_UNSPEC))
log_msg(LOG_WARNING,
"Error parsing X-Forwarded-For header: value '%s' is not an IP address",
xff);
@@ -1088,8 +1088,8 @@ incoming_spa(fko_srv_options_t *opts)
continue;
}
if((spa_ip_demark-spadat.spa_message) < MIN_IPV4_STR_LEN-1
|| (spa_ip_demark-spadat.spa_message) > MAX_IPV4_STR_LEN)
if((spa_ip_demark-spadat.spa_message) < MIN_IPV46_STR_LEN-1
|| (spa_ip_demark-spadat.spa_message) > MAX_IPV46_STR_LEN)
{
log_msg(LOG_WARNING,
"[%s] (stanza #%d) Invalid source IP in SPA message, ignoring SPA packet",
@@ -1100,7 +1100,7 @@ incoming_spa(fko_srv_options_t *opts)
strlcpy(spadat.spa_message_src_ip,
spadat.spa_message, (spa_ip_demark-spadat.spa_message)+1);
if(! is_valid_ipv4_addr(spadat.spa_message_src_ip, strlen(spadat.spa_message_src_ip)))
if(! is_valid_ip_addr(spadat.spa_message_src_ip, strlen(spadat.spa_message_src_ip), AF_UNSPEC))
{
log_msg(LOG_WARNING,
"[%s] (stanza #%d) Invalid source IP in SPA message, ignoring SPA packet",