Commit b017a9db authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

sock/posix: move ssl conf from loop in connect 



This aims to improve code readability (less indentions) but also allows
to extract for loop to separate utility later as a prework for async
connect.

Change-Id: Ic0767c5c85f952826cfe5ed8c81beeeb47a2628a
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26004


Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent f93ee09d

module/sock/posix/posix.c

+21 −24
Original line number Diff line number Diff line
@@ -961,13 +961,20 @@ _posix_sock_connect(const char *ip, int port, struct spdk_sock_opts *opts, bool 
			}

		}



		break;

	}



	freeaddrinfo(res0);

	if (fd < 0) {

		return NULL;

	}



	if (enable_ssl) {

		ctx = posix_sock_create_ssl_context(TLS_client_method(), opts, &impl_opts);

		if (!ctx) {

			SPDK_ERRLOG("posix_sock_create_ssl_context() failed, errno = %d\n", errno);

			close(fd);

				fd = -1;

				break;

			return NULL;

		}



		ssl = ssl_sock_setup_connect(ctx, fd);
@@ -975,8 +982,7 @@ _posix_sock_connect(const char *ip, int port, struct spdk_sock_opts *opts, bool 
			SPDK_ERRLOG("ssl_sock_setup_connect() failed, errno = %d\n", errno);

			SSL_CTX_free(ctx);

			close(fd);

				fd = -1;

				break;

			return NULL;

		}

	}
@@ -984,15 +990,6 @@ _posix_sock_connect(const char *ip, int port, struct spdk_sock_opts *opts, bool 
		SSL_free(ssl);

		SSL_CTX_free(ctx);

		close(fd);

			fd = -1;

			break;

		}



		break;

	}



	freeaddrinfo(res0);

	if (fd < 0) {

		return NULL;

	}