fabrics: fix concat during nvme 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 alone
and not for generated PSK TLS. For generated PSK TLS connections using
--concat (i.e. secure channel concat), this would lead to connection
failures since both --tls and --concat are not to be invoked together.

Fix this by distinguishing the two through their respective treq values
and setting the appropriate --tls or --concat flags for each.

Signed-off-by: Martin George <[email protected]>
(cherry picked from commit 3f2ca96d77b1)
Signed-off-by: Daniel Wagner <[email protected]>

Author: martin-gpy

src/nvme/fabrics.c

@@ -1100,8 +1100,12 @@ nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h,
 		c->cfg.disable_sqflow = true;
 
 	if (e->trtype == NVMF_TRTYPE_TCP &&
-	    e->tsas.tcp.sectype != NVMF_TCP_SECTYPE_NONE)
-		c->cfg.tls = true;
+	    e->tsas.tcp.sectype != NVMF_TCP_SECTYPE_NONE) {
+		if (e->treq & NVMF_TREQ_REQUIRED)
+			c->cfg.tls = true;
+		else if (e->treq & NVMF_TREQ_NOT_REQUIRED)
+			c->cfg.concat = true;
+	}
 
 	ret = nvmf_add_ctrl(h, c, cfg);
 	if (!ret)