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

util/net: fix err logs and errno propagation 



While doing that also adjust sock spdk_sock_getaddr return description.

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


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

include/spdk/net.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ bool spdk_net_is_loopback(int fd); 
 * \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.

 * \return 0 on success, -1 on failure with errno set.

 */

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

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

include/spdk/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ void spdk_sock_get_default_opts(struct spdk_sock_opts *opts); 
 * \param clen Length of the buffer 'caddr'.

 * \param cport A pointer(May be NULL) to the buffer to hold the port info of server.

 *

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

 * \return 0 on success, -1 on failure with errno set.

 */

int spdk_sock_getaddr(struct spdk_sock *sock, char *saddr, int slen, uint16_t *sport,

		      char *caddr, int clen, uint16_t *cport);

lib/util/net.c

+6 −2
Original line number Diff line number Diff line
@@ -144,13 +144,15 @@ spdk_net_getaddr(int fd, char *laddr, int llen, uint16_t *lport, 
		break;

	default:

		/* Unsupported socket family */

		errno = EINVAL;

		return -1;

	}



	if (laddr) {

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

		if (rc != 0) {

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

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

			errno = abs(rc);

			return -1;

		}

	}
@@ -169,6 +171,7 @@ spdk_net_getaddr(int fd, char *laddr, int llen, uint16_t *lport, 
		/* It is an error to getaddr for a peer address on a listen socket. */

		if (paddr != NULL || pport != NULL) {

			SPDK_ERRLOG("paddr, pport not valid on listen sockets\n");

			errno = EINVAL;

			return -1;

		}

		return 0;
@@ -187,7 +190,8 @@ spdk_net_getaddr(int fd, char *laddr, int llen, uint16_t *lport, 
	if (paddr) {

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

		if (rc != 0) {

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

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

			errno = abs(rc);

			return -1;

		}

	}