external
/
uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix autotest

This commit is contained in:
Jan Vidar Krey 2009-07-26 06:06:27 +02:00
parent 444f991f44
commit 099ed6dbe2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
autotest/test_ipfilter.tcc
View File

@ -405,74 +405,74 @@ EXO_TEST(check_ban_setup_1, {
EXO_TEST(check_ban_ipv4_1, { EXO_TEST(check_ban_ipv4_1, {
struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.0", &addr); struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.0", &addr);
return acl_check_ip_range(&addr, &ban4); return ip_in_range(&addr, &ban4);
}); });
EXO_TEST(check_ban_ipv4_2, { EXO_TEST(check_ban_ipv4_2, {
struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.1", &addr); struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.1", &addr);
return acl_check_ip_range(&addr, &ban4); return ip_in_range(&addr, &ban4);
}); });
EXO_TEST(check_ban_ipv4_3, { EXO_TEST(check_ban_ipv4_3, {
struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.255", &addr); struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.255", &addr);
return acl_check_ip_range(&addr, &ban4); return ip_in_range(&addr, &ban4);
}); });
EXO_TEST(check_ban_ipv4_4, { EXO_TEST(check_ban_ipv4_4, {
struct ip_addr_encap addr; ip_convert_to_binary("192.168.1.0", &addr); struct ip_addr_encap addr; ip_convert_to_binary("192.168.1.0", &addr);
return !acl_check_ip_range(&addr, &ban4); return !ip_in_range(&addr, &ban4);
}); });
EXO_TEST(check_ban_ipv4_5, { EXO_TEST(check_ban_ipv4_5, {
struct ip_addr_encap addr; ip_convert_to_binary("192.167.255.255", &addr); struct ip_addr_encap addr; ip_convert_to_binary("192.167.255.255", &addr);
return !acl_check_ip_range(&addr, &ban4); return !ip_in_range(&addr, &ban4);
}); });
EXO_TEST(check_ban_ipv6_1, { EXO_TEST(check_ban_ipv6_1, {
if (!ipv6) return 1; if (!ipv6) return 1;
struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:0", &addr); struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:0", &addr);
return acl_check_ip_range(&addr, &ban6); return ip_in_range(&addr, &ban6);
}); });
EXO_TEST(check_ban_ipv6_2, { EXO_TEST(check_ban_ipv6_2, {
if (!ipv6) return 1; if (!ipv6) return 1;
struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:1", &addr); struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:1", &addr);
return acl_check_ip_range(&addr, &ban6); return ip_in_range(&addr, &ban6);
}); });
EXO_TEST(check_ban_ipv6_3, { EXO_TEST(check_ban_ipv6_3, {
if (!ipv6) return 1; if (!ipv6) return 1;
struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:fffe", &addr); struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:fffe", &addr);
return acl_check_ip_range(&addr, &ban6); return ip_in_range(&addr, &ban6);
}); });
EXO_TEST(check_ban_ipv6_4, { EXO_TEST(check_ban_ipv6_4, {
if (!ipv6) return 1; if (!ipv6) return 1;
struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:ffff", &addr); struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:ffff", &addr);
return acl_check_ip_range(&addr, &ban6); return ip_in_range(&addr, &ban6);
}); });
EXO_TEST(check_ban_ipv6_5, { EXO_TEST(check_ban_ipv6_5, {
if (!ipv6) return 1; if (!ipv6) return 1;
struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefb:0", &addr); struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefb:0", &addr);
return !acl_check_ip_range(&addr, &ban6); return !ip_in_range(&addr, &ban6);
}); });
EXO_TEST(check_ban_ipv6_6, { EXO_TEST(check_ban_ipv6_6, {
if (!ipv6) return 1; if (!ipv6) return 1;
struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fef9:ffff", &addr); struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fef9:ffff", &addr);
return !acl_check_ip_range(&addr, &ban6); return !ip_in_range(&addr, &ban6);
}); });
EXO_TEST(check_ban_afmix_1, { EXO_TEST(check_ban_afmix_1, {
if (!ipv6) return 1; if (!ipv6) return 1;
struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fef9:ffff", &addr); struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fef9:ffff", &addr);
return !acl_check_ip_range(&addr, &ban4); return !ip_in_range(&addr, &ban4);
}); });
EXO_TEST(check_ban_afmix_2, { EXO_TEST(check_ban_afmix_2, {
struct ip_addr_encap addr; ip_convert_to_binary("10.20.30.40", &addr); struct ip_addr_encap addr; ip_convert_to_binary("10.20.30.40", &addr);
return !acl_check_ip_range(&addr, &ban6); return !ip_in_range(&addr, &ban6);
}); });
EXO_TEST(ip4_bitwise_AND_1, { EXO_TEST(ip4_bitwise_AND_1, {