Skip to content

Commit d1377a7

Browse files
committed
fabrics: fix concat during connect-all
During nvme connect-all, if a discovery log page record reports the sectype as anything other than NVMF_TCP_SECTYPE_NONE in nvmf_connect_disc_entry(), it then assumes that tls should be default set for the same. But this holds true only for configured PSK TLS connections alone and not generated PSK TLS (i.e. secure channel concat) connections since both concat and tls flags are meant to be mutually exclusive. Fix the same. Signed-off-by: Martin George <[email protected]>
1 parent aa60cdb commit d1377a7

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

libnvme/src/nvme/fabrics.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,10 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
10681068
free(traddr);
10691069
}
10701070

1071+
/* concat and tls flags should be mutually exclusive */
1072+
if (c->cfg.concat)
1073+
c->cfg.tls = false;
1074+
10711075
ret = build_options(h, c, &argstr);
10721076
if (ret)
10731077
return ret;

0 commit comments

Comments
 (0)