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

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

Staging: hv: util: kvp: Cleanup kvp_get_domain_name() 



Cleanup kvp_get_domain_name(). If getaddrinfo() fails, deal with it properly
(this can happen if no IP address has been assigned). Also, don't specify
a specific service in the call to getaddrinfo() to make this code as generic
as possible. Lastly, move the call to gethostname() after the local variables.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e54bbc64

drivers/staging/hv/tools/hv_kvp_daemon.c

+3 −5
Original line number Diff line number Diff line
@@ -273,22 +273,20 @@ static int 
kvp_get_domain_name(char *buffer, int length)

{

	struct addrinfo	hints, *info ;

	gethostname(buffer, length);

	int error = 0;



	gethostname(buffer, length);

	memset(&hints, 0, sizeof(hints));

	hints.ai_family = AF_INET; /*Get only ipv4 addrinfo. */

	hints.ai_socktype = SOCK_STREAM;

	hints.ai_flags = AI_CANONNAME;



	error = getaddrinfo(buffer, "http", &hints, &info);

	error = getaddrinfo(buffer, NULL, &hints, &info);

	if (error != 0) {

		strcpy(buffer, "getaddrinfo failed\n");

		error = 1;

		goto get_domain_done;

		return error;

	}

	strcpy(buffer, info->ai_canonname);

get_domain_done:

	freeaddrinfo(info);

	return error;

}