diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 6f165be0f..f528e7aa8 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -168,7 +168,7 @@ spdk_iscsi_netmask_allow_addr(const char *netmask, const char *addr) if (netmask == NULL || addr == NULL) { return false; } - if (strcasecmp(netmask, "ALL") == 0) { + if (strcasecmp(netmask, "ANY") == 0) { return true; } if (netmask[0] == '[') { diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c index bf97f9bcf..e1a2dead5 100644 --- a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c +++ b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c @@ -124,6 +124,24 @@ config_file_fail_cases(void) spdk_conf_free(config); } +static void +allow_any_allowed(void) +{ + bool result; + char *netmask; + char *addr1, *addr2; + + netmask = "ANY"; + addr1 = "2001:ad6:1234:5678:9abc::"; + addr2 = "192.168.2.1"; + + result = spdk_iscsi_netmask_allow_addr(netmask, addr1); + CU_ASSERT(result == true); + + result = spdk_iscsi_netmask_allow_addr(netmask, addr2); + CU_ASSERT(result == true); +} + static void allow_ipv6_allowed(void) { @@ -662,6 +680,7 @@ main(int argc, char **argv) if ( CU_add_test(suite, "config file fail cases", config_file_fail_cases) == NULL + || CU_add_test(suite, "allow any allowed case", allow_any_allowed) == NULL || CU_add_test(suite, "allow ipv6 allowed case", allow_ipv6_allowed) == NULL || CU_add_test(suite, "allow ipv6 denied case", allow_ipv6_denied) == NULL || CU_add_test(suite, "allow ipv4 allowed case", allow_ipv4_allowed) == NULL