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

Commit 7bfca0cf authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Jens Axboe
Browse files

iscsi-target: use common inet_addr_is_any 



Instead of open-coding it.

Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Cc: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Cc: target-devel@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4c652685

drivers/target/iscsi/iscsi_target.c

+2 −26
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/delay.h>

#include <linux/sched/signal.h>

#include <asm/unaligned.h>

#include <linux/inet.h>

#include <net/ipv6.h>

#include <scsi/scsi_proto.h>

#include <scsi/iscsi_proto.h>
@@ -3291,30 +3292,6 @@ iscsit_send_task_mgt_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	return conn->conn_transport->iscsit_xmit_pdu(conn, cmd, NULL, NULL, 0);

}



static bool iscsit_check_inaddr_any(struct iscsi_np *np)

{

	bool ret = false;



	if (np->np_sockaddr.ss_family == AF_INET6) {

		const struct sockaddr_in6 sin6 = {

			.sin6_addr = IN6ADDR_ANY_INIT };

		struct sockaddr_in6 *sock_in6 =

			 (struct sockaddr_in6 *)&np->np_sockaddr;



		if (!memcmp(sock_in6->sin6_addr.s6_addr,

				sin6.sin6_addr.s6_addr, 16))

			ret = true;

	} else {

		struct sockaddr_in * sock_in =

			(struct sockaddr_in *)&np->np_sockaddr;



		if (sock_in->sin_addr.s_addr == htonl(INADDR_ANY))

			ret = true;

	}



	return ret;

}



#define SENDTARGETS_BUF_LIMIT 32768U



static int
@@ -3393,7 +3370,6 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd, 
			list_for_each_entry(tpg_np, &tpg->tpg_gnp_list,

						tpg_np_list) {

				struct iscsi_np *np = tpg_np->tpg_np;

				bool inaddr_any = iscsit_check_inaddr_any(np);

				struct sockaddr_storage *sockaddr;



				if (np->np_network_transport != network_transport)
@@ -3422,7 +3398,7 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd, 
					}

				}



				if (inaddr_any)

				if (inet_addr_is_any((struct sockaddr *)&np->np_sockaddr))

					sockaddr = &conn->local_sockaddr;

				else

					sockaddr = &np->np_sockaddr;