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

sock: clarify spdk_sock_posix_fd_connect behavior 



While doing so added nonblock clear as bind() can be affected by it.

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


Community-CI: Mellanox Build Bot
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>
parent 62e98dca

include/spdk_internal/sock_module.h

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ int spdk_sock_posix_fd_create(struct addrinfo *res, struct spdk_sock_opts *opts, 
/**

 * Connects the socket to the address.

 *

 * On success O_NONBLOCK is cleared otherwise property value is undefined.

 *

 * \return 0 on success, -1 on failure, 1 to retry with different address if available.

 */

int spdk_sock_posix_fd_connect(int fd, struct addrinfo *res, struct spdk_sock_opts *opts);

lib/sock/sock.c

+6 −8
Original line number Diff line number Diff line
@@ -467,18 +467,16 @@ spdk_sock_posix_fd_connect(int fd, struct addrinfo *res, struct spdk_sock_opts * 
	const char *src_addr;

	uint16_t src_port;

	struct addrinfo hints, *src_ai;

	int rc, err, flag;

	int rc, err;

	struct pollfd pfd = {.fd = fd, .events = POLLOUT};

	socklen_t len = sizeof(err);

	bool nonblock;



	flag = fcntl(fd, F_GETFL);

	if (flag < 0) {

		SPDK_ERRLOG("fcntl can't get file status flag, fd: %d (%s)\n", fd, spdk_strerror(errno));

	/* Socket address may be not assigned immediately during bind() and

	 * can return EINPROGRESS if function is invoked with O_NONBLOCK set. */

	if (spdk_fd_clear_nonblock(fd)) {

		return -1;

	}



	nonblock = flag & O_NONBLOCK;

	src_addr = SPDK_GET_FIELD(opts, src_addr, NULL, opts->opts_size);

	src_port = SPDK_GET_FIELD(opts, src_port, 0, opts->opts_size);

	if (src_addr != NULL || src_port != 0) {
@@ -503,7 +501,7 @@ spdk_sock_posix_fd_connect(int fd, struct addrinfo *res, struct spdk_sock_opts * 
		freeaddrinfo(src_ai);

	}



	if (!nonblock && spdk_fd_set_nonblock(fd)) {

	if (spdk_fd_set_nonblock(fd)) {

		return -1;

	}
@@ -541,7 +539,7 @@ spdk_sock_posix_fd_connect(int fd, struct addrinfo *res, struct spdk_sock_opts * 
		return 1;

	}



	if (!nonblock && spdk_fd_clear_nonblock(fd)) {

	if (spdk_fd_clear_nonblock(fd)) {

		return -1;

	}