Commit 0fb77ea8 authored by Liu Qing's avatar Liu Qing Committed by Tomasz Zawadzki
Browse files

sock/posix: move fd creation to a separated function 



Options modified on sock after connected is also moved to a
function.

Signed-off-by: default avatarLiu Qing <winglq@gmail.com>
Change-Id: I4c2a9ae9858c102764959d055bed208b4b0621d9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9516


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 549429e1

module/sock/posix/posix.c

+79 −65
Original line number Diff line number Diff line
@@ -303,23 +303,14 @@ posix_sock_set_sendbuf(struct spdk_sock *_sock, int sz) 
	return 0;

}



static struct spdk_posix_sock *

posix_sock_alloc(int fd, bool enable_zero_copy)

static void

posix_sock_init(struct spdk_posix_sock *sock, bool enable_zero_copy)

{

	struct spdk_posix_sock *sock;

#if defined(SPDK_ZEROCOPY) || defined(__linux__)

	int flag;

	int rc;

#endif



	sock = calloc(1, sizeof(*sock));

	if (sock == NULL) {

		SPDK_ERRLOG("sock allocation failed\n");

		return NULL;

	}



	sock->fd = fd;



#if defined(SPDK_ZEROCOPY)

	flag = 1;
@@ -350,61 +341,36 @@ posix_sock_alloc(int fd, bool enable_zero_copy) 
		spdk_sock_map_insert(&g_map, sock->placement_id, NULL);

	}

#endif



	return sock;

}



static struct spdk_sock *

posix_sock_create(const char *ip, int port,

		  enum posix_sock_create_type type,

		  struct spdk_sock_opts *opts)

static struct spdk_posix_sock *

posix_sock_alloc(int fd, bool enable_zero_copy)

{

	struct spdk_posix_sock *sock;

	char buf[MAX_TMPBUF];

	char portnum[PORTNUMLEN];

	char *p;

	struct addrinfo hints, *res, *res0;

	int fd, flag;

	int val = 1;

	int rc, sz;

	bool enable_zcopy_user_opts = true;

	bool enable_zcopy_impl_opts = true;



	assert(opts != NULL);



	if (ip == NULL) {

	sock = calloc(1, sizeof(*sock));

	if (sock == NULL) {

		SPDK_ERRLOG("sock allocation failed\n");

		return NULL;

	}

	if (ip[0] == '[') {

		snprintf(buf, sizeof(buf), "%s", ip + 1);

		p = strchr(buf, ']');

		if (p != NULL) {

			*p = '\0';

		}

		ip = (const char *) &buf[0];

	}



	snprintf(portnum, sizeof portnum, "%d", port);

	memset(&hints, 0, sizeof hints);

	hints.ai_family = PF_UNSPEC;

	hints.ai_socktype = SOCK_STREAM;

	hints.ai_flags = AI_NUMERICSERV;

	hints.ai_flags |= AI_PASSIVE;

	hints.ai_flags |= AI_NUMERICHOST;

	rc = getaddrinfo(ip, portnum, &hints, &res0);

	if (rc != 0) {

		SPDK_ERRLOG("getaddrinfo() failed %s (%d)\n", gai_strerror(rc), rc);

		return NULL;

	sock->fd = fd;

	posix_sock_init(sock, enable_zero_copy);



	return sock;

}



	/* try listen */

	fd = -1;

	for (res = res0; res != NULL; res = res->ai_next) {

retry:

static int

posix_fd_create(struct addrinfo *res, struct spdk_sock_opts *opts)

{

	int fd;

	int val = 1;

	int rc, sz;



	fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);

	if (fd < 0) {

		/* error */

			continue;

		return -1;

	}



	sz = g_spdk_posix_sock_impl_opts.recv_buf_size;
@@ -422,16 +388,14 @@ retry: 
	rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof val);

	if (rc != 0) {

		close(fd);

			fd = -1;

		/* error */

			continue;

		return -1;

	}

	rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof val);

	if (rc != 0) {

		close(fd);

			fd = -1;

		/* error */

			continue;

		return -1;

	}



#if defined(SO_PRIORITY)
@@ -439,9 +403,8 @@ retry: 
		rc = setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &opts->priority, sizeof val);

		if (rc != 0) {

			close(fd);

				fd = -1;

			/* error */

				continue;

			return -1;

		}

	}

#endif
@@ -450,12 +413,63 @@ retry: 
		rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof val);

		if (rc != 0) {

			close(fd);

				fd = -1;

			/* error */

				continue;

			return -1;

		}

	}

	return fd;

}



static struct spdk_sock *

posix_sock_create(const char *ip, int port,

		  enum posix_sock_create_type type,

		  struct spdk_sock_opts *opts)

{

	struct spdk_posix_sock *sock;

	char buf[MAX_TMPBUF];

	char portnum[PORTNUMLEN];

	char *p;

	struct addrinfo hints, *res, *res0;

	int fd, flag;

	int rc;

	bool enable_zcopy_user_opts = true;

	bool enable_zcopy_impl_opts = true;



	assert(opts != NULL);



	if (ip == NULL) {

		return NULL;

	}

	if (ip[0] == '[') {

		snprintf(buf, sizeof(buf), "%s", ip + 1);

		p = strchr(buf, ']');

		if (p != NULL) {

			*p = '\0';

		}

		ip = (const char *) &buf[0];

	}



	snprintf(portnum, sizeof portnum, "%d", port);

	memset(&hints, 0, sizeof hints);

	hints.ai_family = PF_UNSPEC;

	hints.ai_socktype = SOCK_STREAM;

	hints.ai_flags = AI_NUMERICSERV;

	hints.ai_flags |= AI_PASSIVE;

	hints.ai_flags |= AI_NUMERICHOST;

	rc = getaddrinfo(ip, portnum, &hints, &res0);

	if (rc != 0) {

		SPDK_ERRLOG("getaddrinfo() failed %s (%d)\n", gai_strerror(rc), rc);

		return NULL;

	}



	/* try listen */

	fd = -1;

	for (res = res0; res != NULL; res = res->ai_next) {

retry:

		fd = posix_fd_create(res, opts);

		if (fd < 0) {

			continue;

		}

		if (type == SPDK_SOCK_CREATE_LISTEN) {

			rc = bind(fd, res->ai_addr, res->ai_addrlen);

			if (rc != 0) {