Commit eaf70c87 authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Konrad Sztyber
Browse files

nvmf: update discovery log page 



Update discovery log page by setting TREQ and TSAS.

Change-Id: I9ecc4225178a1a039f2e434a40af802c6bcdc5bb
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16117


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 8d30c85a

include/spdk/nvmf_spec.h

+5 −2
Original line number Diff line number Diff line
@@ -333,8 +333,11 @@ enum spdk_nvme_tcp_secure_socket_type { 
	/** No security */

	SPDK_NVME_TCP_SECURITY_NONE			= 0,



	/** TLS (Secure Sockets) */

	SPDK_NVME_TCP_SECURITY_TLS			= 1,

	/** TLS (Secure Sockets) version 1.2 */

	SPDK_NVME_TCP_SECURITY_TLS_1_2			= 1,



	/** TLS (Secure Sockets) version 1.3 */

	SPDK_NVME_TCP_SECURITY_TLS_1_3			= 2,

};



/** TCP transport-specific address subtype */

lib/nvmf/tcp.c

+15 −2
Original line number Diff line number Diff line
@@ -1350,15 +1350,28 @@ nvmf_tcp_discover(struct spdk_nvmf_transport *transport, 
		  struct spdk_nvme_transport_id *trid,

		  struct spdk_nvmf_discovery_log_page_entry *entry)

{

	struct spdk_nvmf_tcp_port *port;

	struct spdk_nvmf_tcp_transport *ttransport;



	entry->trtype = SPDK_NVMF_TRTYPE_TCP;

	entry->adrfam = trid->adrfam;

	entry->treq.secure_channel = SPDK_NVMF_TREQ_SECURE_CHANNEL_NOT_REQUIRED;



	spdk_strcpy_pad(entry->trsvcid, trid->trsvcid, sizeof(entry->trsvcid), ' ');

	spdk_strcpy_pad(entry->traddr, trid->traddr, sizeof(entry->traddr), ' ');



	ttransport = SPDK_CONTAINEROF(transport, struct spdk_nvmf_tcp_transport, transport);

	port = nvmf_tcp_find_port(ttransport, trid);



	assert(port != NULL);



	if (strcmp(spdk_sock_get_impl_name(port->listen_sock), "ssl") == 0) {

		entry->treq.secure_channel = SPDK_NVMF_TREQ_SECURE_CHANNEL_REQUIRED;

		entry->tsas.tcp.sectype = SPDK_NVME_TCP_SECURITY_TLS_1_3;

	} else {

		entry->treq.secure_channel = SPDK_NVMF_TREQ_SECURE_CHANNEL_NOT_REQUIRED;

		entry->tsas.tcp.sectype = SPDK_NVME_TCP_SECURITY_NONE;

	}

}



static struct spdk_nvmf_tcp_control_msg_list *

nvmf_tcp_control_msg_list_create(uint16_t num_messages)

test/unit/lib/nvmf/tcp.c/tcp_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ DEFINE_STUB(spdk_nvme_ns_get_format_index, uint32_t, 
	    (const struct spdk_nvme_ns_data *nsdata), 0);



DEFINE_STUB(spdk_sock_get_default_impl_name, const char *, (void), "");

DEFINE_STUB(spdk_sock_get_impl_name, const char *, (struct spdk_sock *sock), "");



struct spdk_io_channel *

spdk_accel_get_io_channel(void)