DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Port src_dst_check() to IPv6

Browse Source 
The problem looks real, fix looks good to me, but have not been able to
reproduce the actual issue so far :(
This commit is contained in:
Pierre Pronchery 2018-08-17 01:55:03 +02:00
parent 46d4d77a66
commit 3f3b304cf4
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/incoming_spa.c
View File

@ -441,16 +441,32 @@ static int
src_dst_check(acc_stanza_t *acc, spa_pkt_info_t *spa_pkt, src_dst_check(acc_stanza_t *acc, spa_pkt_info_t *spa_pkt,
spa_data_t *spadat, const int stanza_num) spa_data_t *spadat, const int stanza_num)
{ {
if(! compare_addr_list(acc->source_list, AF_INET, ntohl(spa_pkt->packet_src_ip)) || switch (spa_pkt->packet_family)
(acc->destination_list != NULL
&& ! compare_addr_list(acc->destination_list, AF_INET, ntohl(spa_pkt->packet_dst_ip))))
{ {
log_msg(LOG_DEBUG, case AF_INET:
"(stanza #%d) SPA packet (%s -> %s) filtered by SOURCE and/or DESTINATION criteria", if(! compare_addr_list(acc->source_list, AF_INET, ntohl(spa_pkt->packet_src_ip)) ||
stanza_num, spadat->pkt_source_ip, spadat->pkt_destination_ip); (acc->destination_list != NULL
return 0; && ! compare_addr_list(acc->destination_list, AF_INET, ntohl(spa_pkt->packet_dst_ip))))
{
log_msg(LOG_DEBUG,
"(stanza #%d) SPA packet (%s -> %s) filtered by SOURCE and/or DESTINATION criteria",
stanza_num, spadat->pkt_source_ip, spadat->pkt_destination_ip);
return 0;
}
return 1;
case AF_INET6:
if(! compare_addr_list(acc->source_list, AF_INET6, &spa_pkt->packet_addr.inet6.src_ip) ||
(acc->destination_list != NULL
&& ! compare_addr_list(acc->destination_list, AF_INET6, &spa_pkt->packet_addr.inet6.dst_ip)))
{
log_msg(LOG_DEBUG,
"(stanza #%d) SPA packet (%s -> %s) filtered by SOURCE and/or DESTINATION criteria",
stanza_num, spadat->pkt_source_ip, spadat->pkt_destination_ip);
return 0;
}
return 1;
} }
return 1; return 0;
} }
/* Process command messages /* Process command messages