From 1674f37ac94077efbc3f4f22deb3888266ba8a3d Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Wed, 29 Nov 2017 15:08:38 +0900 Subject: [PATCH] iscsi: Rename access control functions of target Naming rule of access control of iSCSI target does not reveal its intention. Hence change it before refactoring to avoid unnecessary repeated procedure. Change-Id: I4064ec0a5a2b52244b6de3958ee2ab41342d1a57 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/381248 Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Daniel Verkamp --- lib/iscsi/tgt_node.c | 16 ++++++++-------- test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 01ba42b4e..be8a98781 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -53,7 +53,7 @@ #define MAX_MASKBUF 128 static bool -spdk_iscsi_tgt_node_allow_ipv6(const char *netmask, const char *addr) +spdk_iscsi_ipv6_netmask_allow_addr(const char *netmask, const char *addr) { struct in6_addr in6_mask; struct in6_addr in6_addr; @@ -111,7 +111,7 @@ spdk_iscsi_tgt_node_allow_ipv6(const char *netmask, const char *addr) } static bool -spdk_iscsi_tgt_node_allow_ipv4(const char *netmask, const char *addr) +spdk_iscsi_ipv4_netmask_allow_addr(const char *netmask, const char *addr) { struct in_addr in4_mask; struct in_addr in4_addr; @@ -156,7 +156,7 @@ spdk_iscsi_tgt_node_allow_ipv4(const char *netmask, const char *addr) } static bool -spdk_iscsi_tgt_node_allow_netmask(const char *netmask, const char *addr) +spdk_iscsi_netmask_allow_addr(const char *netmask, const char *addr) { if (netmask == NULL || addr == NULL) return false; @@ -164,11 +164,11 @@ spdk_iscsi_tgt_node_allow_netmask(const char *netmask, const char *addr) return true; if (netmask[0] == '[') { /* IPv6 */ - if (spdk_iscsi_tgt_node_allow_ipv6(netmask, addr)) + if (spdk_iscsi_ipv6_netmask_allow_addr(netmask, addr)) return true; } else { /* IPv4 */ - if (spdk_iscsi_tgt_node_allow_ipv4(netmask, addr)) + if (spdk_iscsi_ipv4_netmask_allow_addr(netmask, addr)) return true; } return false; @@ -210,7 +210,7 @@ spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "netmask=%s, addr=%s\n", imask->mask, addr); - if (spdk_iscsi_tgt_node_allow_netmask(imask->mask, addr)) { + if (spdk_iscsi_netmask_allow_addr(imask->mask, addr)) { return true; } } @@ -227,7 +227,7 @@ denied: } static bool -spdk_iscsi_tgt_node_visible(struct spdk_iscsi_tgt_node *target, const char *iqn) +spdk_iscsi_tgt_node_allow_iscsi_name(struct spdk_iscsi_tgt_node *target, const char *iqn) { struct spdk_iscsi_init_grp *igp; struct spdk_iscsi_initiator_name *iname; @@ -297,7 +297,7 @@ spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, && strcasecmp(tiqn, target->name) != 0) { continue; } - rc = spdk_iscsi_tgt_node_visible(target, iiqn); + rc = spdk_iscsi_tgt_node_allow_iscsi_name(target, iiqn); if (rc == 0) { continue; } 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 e1687fad4..6983ea90c 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 @@ -118,10 +118,10 @@ allow_ipv6_allowed(void) netmask = "[2001:ad6:1234::]/48"; addr = "2001:ad6:1234:5678:9abc::"; - result = spdk_iscsi_tgt_node_allow_ipv6(netmask, addr); + result = spdk_iscsi_ipv6_netmask_allow_addr(netmask, addr); CU_ASSERT(result == true); - result = spdk_iscsi_tgt_node_allow_netmask(netmask, addr); + result = spdk_iscsi_netmask_allow_addr(netmask, addr); CU_ASSERT(result == true); } @@ -135,10 +135,10 @@ allow_ipv6_denied(void) netmask = "[2001:ad6:1234::]/56"; addr = "2001:ad6:1234:5678:9abc::"; - result = spdk_iscsi_tgt_node_allow_ipv6(netmask, addr); + result = spdk_iscsi_ipv6_netmask_allow_addr(netmask, addr); CU_ASSERT(result == false); - result = spdk_iscsi_tgt_node_allow_netmask(netmask, addr); + result = spdk_iscsi_netmask_allow_addr(netmask, addr); CU_ASSERT(result == false); } @@ -152,10 +152,10 @@ allow_ipv4_allowed(void) netmask = "192.168.2.0/24"; addr = "192.168.2.1"; - result = spdk_iscsi_tgt_node_allow_ipv4(netmask, addr); + result = spdk_iscsi_ipv4_netmask_allow_addr(netmask, addr); CU_ASSERT(result == true); - result = spdk_iscsi_tgt_node_allow_netmask(netmask, addr); + result = spdk_iscsi_netmask_allow_addr(netmask, addr); CU_ASSERT(result == true); } @@ -169,10 +169,10 @@ allow_ipv4_denied(void) netmask = "192.168.2.0"; addr = "192.168.2.1"; - result = spdk_iscsi_tgt_node_allow_ipv4(netmask, addr); + result = spdk_iscsi_ipv4_netmask_allow_addr(netmask, addr); CU_ASSERT(result == false); - result = spdk_iscsi_tgt_node_allow_netmask(netmask, addr); + result = spdk_iscsi_netmask_allow_addr(netmask, addr); CU_ASSERT(result == false); }