Commit 1fcd7d99 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

util: cleanup spdk_net_getaddr 



Previous patch moved the spdk_net_getaddr code, but we cleaned up
the header comments as part of the move to use local/peer terminology
instead of client/server.

Rather than changing all of the variable names to use l/p instead of
s/c in the last patch, do that here instead. Do some other cleanups
as well.

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


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

lib/util/net.c

+18 −18
Original line number Diff line number Diff line
@@ -118,15 +118,15 @@ end: 
}



int

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

		 char *caddr, int clen, uint16_t *cport)

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

		 char *paddr, int plen, uint16_t *pport)

{

	struct sockaddr_storage sa;

	socklen_t salen;

	int rc;



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	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);
@@ -146,39 +146,39 @@ spdk_net_getaddr(int fd, char *saddr, int slen, uint16_t *sport, 
		return -1;

	}



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

	rc = spdk_net_get_address_string((struct sockaddr *)&sa, laddr, llen);

	if (rc != 0) {

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

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

		return -1;

	}



	if (sport) {

	if (lport) {

		if (sa.ss_family == AF_INET) {

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

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

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

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

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

		}

	}



	memset(&sa, 0, sizeof sa);

	salen = sizeof sa;

	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);

	rc = spdk_net_get_address_string((struct sockaddr *)&sa, paddr, plen);

	if (rc != 0) {

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

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

		return -1;

	}



	if (cport) {

	if (pport) {

		if (sa.ss_family == AF_INET) {

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

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

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

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

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

		}

	}