Commit 73a20ca5 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Jim Harris
Browse files

nvme: move auth required check to a function 



Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I75c2917b763a3e3739bfb5e0dec11a9dfe35a3b3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24230


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
parent 5b939d7e

lib/nvme/nvme_fabric.c

+10 −3
Original line number Diff line number Diff line
@@ -637,10 +637,18 @@ finish: 
	return rc;

}



static bool

nvme_fabric_qpair_auth_required(struct spdk_nvme_qpair *qpair)

{

	struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr;



	return qpair->auth.flags & (NVME_QPAIR_AUTH_FLAG_ATR | NVME_QPAIR_AUTH_FLAG_ASCR) ||

	       ctrlr->opts.dhchap_ctrlr_key != NULL;

}



int

nvme_fabric_qpair_connect_poll(struct spdk_nvme_qpair *qpair)

{

	struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr;

	int rc;



	switch (qpair->connect_state) {
@@ -649,8 +657,7 @@ nvme_fabric_qpair_connect_poll(struct spdk_nvme_qpair *qpair) 
		if (rc != 0) {

			break;

		}

		if (qpair->auth.flags & (NVME_QPAIR_AUTH_FLAG_ATR | NVME_QPAIR_AUTH_FLAG_ASCR) ||

		    ctrlr->opts.dhchap_ctrlr_key != NULL) {

		if (nvme_fabric_qpair_auth_required(qpair)) {

			rc = nvme_fabric_qpair_authenticate_async(qpair);

			if (rc == 0) {

				qpair->connect_state = NVME_QPAIR_CONNECT_STATE_AUTHENTICATING;