Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05b96892 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

iscsi-target: Refactor iscsit_get_np sockaddr matching into iscsit_check_np_match 



This patch refactors the sockaddr matching logic in iscsit_get_np() into
a seperate iscsit_check_np_match() that can be used by external code.

Tested-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent fbbf8555

drivers/target/iscsi/iscsi_target.c

+39 −26
Original line number Diff line number Diff line
@@ -264,24 +264,16 @@ int iscsit_deaccess_np(struct iscsi_np *np, struct iscsi_portal_group *tpg) 
	return 0;

}



static struct iscsi_np *iscsit_get_np(

bool iscsit_check_np_match(

	struct __kernel_sockaddr_storage *sockaddr,

	struct iscsi_np *np,

	int network_transport)

{

	struct sockaddr_in *sock_in, *sock_in_e;

	struct sockaddr_in6 *sock_in6, *sock_in6_e;

	struct iscsi_np *np;

	int ip_match = 0;

	bool ip_match = false;

	u16 port;



	spin_lock_bh(&np_lock);

	list_for_each_entry(np, &g_np_list, np_list) {

		spin_lock(&np->np_thread_lock);

		if (np->np_thread_state != ISCSI_NP_THREAD_ACTIVE) {

			spin_unlock(&np->np_thread_lock);

			continue;

		}



	if (sockaddr->ss_family == AF_INET6) {

		sock_in6 = (struct sockaddr_in6 *)sockaddr;

		sock_in6_e = (struct sockaddr_in6 *)&np->np_sockaddr;
@@ -289,22 +281,43 @@ static struct iscsi_np *iscsit_get_np( 
		if (!memcmp(&sock_in6->sin6_addr.in6_u,

			    &sock_in6_e->sin6_addr.in6_u,

			    sizeof(struct in6_addr)))

				ip_match = 1;

			ip_match = true;



		port = ntohs(sock_in6->sin6_port);

	} else {

		sock_in = (struct sockaddr_in *)sockaddr;

		sock_in_e = (struct sockaddr_in *)&np->np_sockaddr;



			if (sock_in->sin_addr.s_addr ==

			    sock_in_e->sin_addr.s_addr)

				ip_match = 1;

		if (sock_in->sin_addr.s_addr == sock_in_e->sin_addr.s_addr)

			ip_match = true;



		port = ntohs(sock_in->sin_port);

	}



		if ((ip_match == 1) && (np->np_port == port) &&

		    (np->np_network_transport == network_transport)) {

	if ((ip_match == true) && (np->np_port == port) &&

	    (np->np_network_transport == network_transport))

		return true;



	return false;

}



static struct iscsi_np *iscsit_get_np(

	struct __kernel_sockaddr_storage *sockaddr,

	int network_transport)

{

	struct iscsi_np *np;

	bool match;



	spin_lock_bh(&np_lock);

	list_for_each_entry(np, &g_np_list, np_list) {

		spin_lock(&np->np_thread_lock);

		if (np->np_thread_state != ISCSI_NP_THREAD_ACTIVE) {

			spin_unlock(&np->np_thread_lock);

			continue;

		}



		match = iscsit_check_np_match(sockaddr, np, network_transport);

		if (match == true) {

			/*

			 * Increment the np_exports reference count now to

			 * prevent iscsit_del_np() below from being called

drivers/target/iscsi/iscsi_target.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ extern struct iscsi_tiqn *iscsit_add_tiqn(unsigned char *); 
extern void iscsit_del_tiqn(struct iscsi_tiqn *);

extern int iscsit_access_np(struct iscsi_np *, struct iscsi_portal_group *);

extern int iscsit_deaccess_np(struct iscsi_np *, struct iscsi_portal_group *);

extern bool iscsit_check_np_match(struct __kernel_sockaddr_storage *,

				struct iscsi_np *, int);

extern struct iscsi_np *iscsit_add_np(struct __kernel_sockaddr_storage *,

				char *, int);

extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *,