Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3321e738 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Tools: hv: Don't return loopback addresses 



Don't return loopback addresses and further don't terminate
the IP address strings with a semicolon. This is the current
behavior of Windows guests.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Reported-by: default avatarClaudio Latini <claudio.latini@live.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f426a36c

tools/hv/hv_kvp_daemon.c

+9 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <sys/stat.h>

#include <fcntl.h>

#include <dirent.h>

#include <net/if.h>



/*

 * KVP protocol: The user mode component first registers with the
@@ -882,7 +883,7 @@ static int kvp_process_ip_address(void *addrp, 
		addr_length = INET6_ADDRSTRLEN;

	}



	if ((length - *offset) < addr_length + 1)

	if ((length - *offset) < addr_length + 2)

		return HV_E_FAIL;

	if (str == NULL) {

		strcpy(buffer, "inet_ntop failed\n");
@@ -890,11 +891,13 @@ static int kvp_process_ip_address(void *addrp, 
	}

	if (*offset == 0)

		strcpy(buffer, tmp);

	else

		strcat(buffer, tmp);

	else {

		strcat(buffer, ";");

		strcat(buffer, tmp);

	}



	*offset += strlen(str) + 1;



	return 0;

}
@@ -956,7 +959,9 @@ kvp_get_ip_info(int family, char *if_name, int op, 
		 * supported address families; if not we gather info on

		 * the specified address family.

		 */

		if ((family != 0) && (curp->ifa_addr->sa_family != family)) {

		if ((((family != 0) &&

			 (curp->ifa_addr->sa_family != family))) ||

			 (curp->ifa_flags & IFF_LOOPBACK)) {

			curp = curp->ifa_next;

			continue;

		}