redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Tools: hv: Don't return loopback addresses

Browse source 
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: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-by: Claudio Latini <claudio.latini@live.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
K. Y. Srinivasan 2012-10-25 14:15:50 -07:00 committed by Greg Kroah-Hartman
parent f426a36cec
commit 3321e738d6
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/hv/hv_kvp_daemon.c
View file

@ -43,6 +43,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <dirent.h> #include <dirent.h>
#include <net/if.h>
/* /*
* KVP protocol: The user mode component first registers with the * 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; addr_length = INET6_ADDRSTRLEN;
} }
if ((length - *offset) < addr_length + 1) if ((length - *offset) < addr_length + 2)
return HV_E_FAIL; return HV_E_FAIL;
if (str == NULL) { if (str == NULL) {
strcpy(buffer, "inet_ntop failed\n"); strcpy(buffer, "inet_ntop failed\n");
@ -890,11 +891,13 @@ static int kvp_process_ip_address(void *addrp,
} }
if (*offset == 0) if (*offset == 0)
strcpy(buffer, tmp); strcpy(buffer, tmp);
else else {
strcat(buffer, tmp);
strcat(buffer, ";"); strcat(buffer, ";");
strcat(buffer, tmp);
}
*offset += strlen(str) + 1; *offset += strlen(str) + 1;
return 0; 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 * supported address families; if not we gather info on
* the specified address family. * 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; curp = curp->ifa_next;
continue; continue;
} }