Commit 7923828f authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

util: add spdk_net_getaddr 



This enables reuse of the vast bulk of the getaddr code that was
previously duplicated in the posix and uring sock modules.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I0d8d1de9907850013736b1766019649c0eddb5f5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24143


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent 9b6823ae

include/spdk/net.h

+16 −0
Original line number Diff line number Diff line
@@ -49,6 +49,22 @@ int spdk_net_get_address_string(struct sockaddr *sa, char *addr, size_t len); 
 */

bool spdk_net_is_loopback(int fd);



/*

 * Get local and peer addresses of the given fd.

 *

 * \param fd file descriptor to get address.

 * \param laddr A pointer to the buffer to hold the local address.

 * \param llen Length of the buffer 'laddr'.

 * \param lport A pointer (may be NULL) to the buffer to hold the local port info.

 * \param paddr A pointer to the buffer to hold the peer address.

 * \param plen Length of the buffer 'paddr'.

 * \param pport A pointer (may be NULL) to the buffer to hold the peer port info.

 *

 * \return 0 on success, -1 on failure.

 */

int spdk_net_getaddr(int fd, char *laddr, int llen, uint16_t *lport,

		     char *paddr, int plen, uint16_t *pport);



#ifdef __cplusplus

}

#endif

lib/util/net.c

+69 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include "spdk/stdinc.h"

#include "spdk/net.h"

#include "spdk/log.h"



int

spdk_net_get_interface_name(const char *ip, char *ifc, size_t len)
@@ -115,3 +116,71 @@ end: 
	freeifaddrs(addrs);

	return is_loopback;

}



int

spdk_net_getaddr(int fd, char *saddr, int slen, uint16_t *sport,

		 char *caddr, int clen, uint16_t *cport)

{

	struct sockaddr_storage sa;

	socklen_t salen;

	int rc;



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	rc = getsockname(fd, (struct sockaddr *) &sa, &salen);

	if (rc != 0) {

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

		return -1;

	}



	switch (sa.ss_family) {

	case AF_UNIX:

		/* Acceptable connection types that don't have IPs */

		return 0;

	case AF_INET:

	case AF_INET6:

		/* Code below will get IP addresses */

		break;

	default:

		/* Unsupported socket family */

		return -1;

	}



	rc = spdk_net_get_address_string((struct sockaddr *)&sa, saddr, slen);

	if (rc != 0) {

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

		return -1;

	}



	if (sport) {

		if (sa.ss_family == AF_INET) {

			*sport = ntohs(((struct sockaddr_in *) &sa)->sin_port);

		} else if (sa.ss_family == AF_INET6) {

			*sport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port);

		}

	}



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	rc = getpeername(fd, (struct sockaddr *) &sa, &salen);

	if (rc != 0) {

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

		return -1;

	}



	rc = spdk_net_get_address_string((struct sockaddr *)&sa, caddr, clen);

	if (rc != 0) {

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

		return -1;

	}



	if (cport) {

		if (sa.ss_family == AF_INET) {

			*cport = ntohs(((struct sockaddr_in *) &sa)->sin_port);

		} else if (sa.ss_family == AF_INET6) {

			*cport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port);

		}

	}



	return 0;

}

lib/util/spdk_util.map

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
	spdk_net_get_interface_name;

	spdk_net_get_address_string;

	spdk_net_is_loopback;

	spdk_net_getaddr;



	# public functions in pipe.h

	spdk_pipe_create;

module/sock/posix/posix.c

+1 −62
Original line number Diff line number Diff line
@@ -226,70 +226,9 @@ posix_sock_getaddr(struct spdk_sock *_sock, char *saddr, int slen, uint16_t *spo 
		   char *caddr, int clen, uint16_t *cport)

{

	struct spdk_posix_sock *sock = __posix_sock(_sock);

	struct sockaddr_storage sa;

	socklen_t salen;

	int rc;



	assert(sock != NULL);



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	rc = getsockname(sock->fd, (struct sockaddr *) &sa, &salen);

	if (rc != 0) {

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

		return -1;

	}



	switch (sa.ss_family) {

	case AF_UNIX:

		/* Acceptable connection types that don't have IPs */

		return 0;

	case AF_INET:

	case AF_INET6:

		/* Code below will get IP addresses */

		break;

	default:

		/* Unsupported socket family */

		return -1;

	}



	rc = spdk_net_get_address_string((struct sockaddr *)&sa, saddr, slen);

	if (rc != 0) {

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

		return -1;

	}



	if (sport) {

		if (sa.ss_family == AF_INET) {

			*sport = ntohs(((struct sockaddr_in *) &sa)->sin_port);

		} else if (sa.ss_family == AF_INET6) {

			*sport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port);

		}

	}



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	rc = getpeername(sock->fd, (struct sockaddr *) &sa, &salen);

	if (rc != 0) {

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

		return -1;

	}



	rc = spdk_net_get_address_string((struct sockaddr *)&sa, caddr, clen);

	if (rc != 0) {

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

		return -1;

	}



	if (cport) {

		if (sa.ss_family == AF_INET) {

			*cport = ntohs(((struct sockaddr_in *) &sa)->sin_port);

		} else if (sa.ss_family == AF_INET6) {

			*cport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port);

		}

	}



	return 0;

	return spdk_net_getaddr(sock->fd, saddr, slen, sport, caddr, clen, cport);

}



enum posix_sock_create_type {

module/sock/uring/uring.c

+1 −62
Original line number Diff line number Diff line
@@ -231,70 +231,9 @@ uring_sock_getaddr(struct spdk_sock *_sock, char *saddr, int slen, uint16_t *spo 
		   char *caddr, int clen, uint16_t *cport)

{

	struct spdk_uring_sock *sock = __uring_sock(_sock);

	struct sockaddr_storage sa;

	socklen_t salen;

	int rc;



	assert(sock != NULL);



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	rc = getsockname(sock->fd, (struct sockaddr *) &sa, &salen);

	if (rc != 0) {

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

		return -1;

	}



	switch (sa.ss_family) {

	case AF_UNIX:

		/* Acceptable connection types that don't have IPs */

		return 0;

	case AF_INET:

	case AF_INET6:

		/* Code below will get IP addresses */

		break;

	default:

		/* Unsupported socket family */

		return -1;

	}



	rc = spdk_net_get_address_string((struct sockaddr *)&sa, saddr, slen);

	if (rc != 0) {

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

		return -1;

	}



	if (sport) {

		if (sa.ss_family == AF_INET) {

			*sport = ntohs(((struct sockaddr_in *) &sa)->sin_port);

		} else if (sa.ss_family == AF_INET6) {

			*sport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port);

		}

	}



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	rc = getpeername(sock->fd, (struct sockaddr *) &sa, &salen);

	if (rc != 0) {

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

		return -1;

	}



	rc = spdk_net_get_address_string((struct sockaddr *)&sa, caddr, clen);

	if (rc != 0) {

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

		return -1;

	}



	if (cport) {

		if (sa.ss_family == AF_INET) {

			*cport = ntohs(((struct sockaddr_in *) &sa)->sin_port);

		} else if (sa.ss_family == AF_INET6) {

			*cport = ntohs(((struct sockaddr_in6 *) &sa)->sin6_port);

		}

	}



	return 0;

	return spdk_net_getaddr(sock->fd, saddr, slen, sport, caddr, clen, cport);

}



enum uring_sock_create_type {