From patchwork Fri Mar 1 12:56:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shradha Gupta X-Patchwork-Id: 208825 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp1055587dyb; Fri, 1 Mar 2024 04:56:36 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVZPzCnLGi6XN6ix9nH+ZpYHVK71mdXqUq0ifZzZSKj1fov2IUp5JGpm/wFjI0ycjvkzL2UNxPxqnmD2l31zDvVPUAstg== X-Google-Smtp-Source: AGHT+IFF1tbt1R9NxHpXJ3rF48bLOfIDWBsgkwF+DYLPiHdK1mYdFwVXFv8IKHb8sUaU5hpu0iV5 X-Received: by 2002:a05:6214:1406:b0:690:4942:dd89 with SMTP id pr6-20020a056214140600b006904942dd89mr1553232qvb.28.1709297796049; Fri, 01 Mar 2024 04:56:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709297796; cv=pass; d=google.com; s=arc-20160816; b=rV/5EjHp7nKRettPklEsA6GmYgnM+M+BuKQULelerlKMy+jdu/1glW+VvaoMtbf4NQ A3Aiv0MWesy5+nWsvt0+oBYQprt155Dadg6+XBCWIal4sBPdidmz00HwAUd2mOKXoXtJ uuPlXEWqdVDNrO8Lv+7Vos02gqRVXqVQySu0zCxjLWg1JgBNeAzW/Dy5M+p7II7qEjIK qU+C6LkvOIieSzDG1vOa7q9qt4CESsImRz9fZuuyfHChtbkpGZJwNRsjIuL0/f5g9eNZ kWtK8A8vIzX5m2r3ijx579d64eDN6ceUmHXJ8wKRpvtME/DtFVPizVrnT0OaA/tYm0mq nXHA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=+fycukGm4sgzp9r6OLPcfHk+mP0SxlL5O9Scws8TfrY=; fh=iXBWNo/x7fXCTckWZW3UImGBmcfh6deDAsZmCDLWSy8=; b=YvetzevIxPiFGhqb/ZVwsXk+X5WfhHxno8Fo/Pj25ougNtyTrWpyQIg6lhMjhYW+is ssowmw62p1gyPt4S0WPqO3bLPozGogJWZHAZWE6A4iAer5ki/NfUf81T6vLzTHhtl2/b dBS1YQIVjZ69yydbAc7HyAOB12WyQmLeqh/1iLIr7Ja6HRZEFycJPw3XHFBjvh1YYBSo WcOIk+NaUtGfBUXXnPts5or2wtwLATXK6F07i6BDDKzDIBH6DtJEYpO47jRiX2Fw+3tV wnFC1cYb5f7H6XiqU/DBvIMgME5u66mQANohP8IM8d/LwFlGBIb9rLjpASOxam4pKRyQ /i/Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=gYOU+NaL; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-88423-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88423-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id fv14-20020a056214240e00b0068f36249382si3458470qvb.334.2024.03.01.04.56.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 04:56:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88423-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=gYOU+NaL; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-88423-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88423-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C53B81C21988 for ; Fri, 1 Mar 2024 12:56:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 255035F84C; Fri, 1 Mar 2024 12:56:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="gYOU+NaL" Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7138A384; Fri, 1 Mar 2024 12:56:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709297782; cv=none; b=ZTBl/OHgbjQmEnGLwiodBUlXIIdfCjvCSxf1PtUnCd8p7wHBDENK9TCWyvFDjBTlfjT9A7s3/Q61j0X6yp/u/uzYS+QtteXWz07Av2eg7mXhoUYs+urQO6JfDJg7o2NKaVDnJ234e0SSmdzMRm0Fdklg7h3uSS0iZgY11QsKa2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709297782; c=relaxed/simple; bh=WsS8mF/x31DhxHhlSqaR+Y5fzG0/7lWK0Ux8VWKoggE=; h=From:To:Cc:Subject:Date:Message-Id; b=C3gXUlfFFiGqJsqAewt+lznkGsCtXfsvK/O1iWGZNBqRmGPy/Fb+UBruMTZEXdZ8dA76uniN4KGKcQQbdCqhc6Rzy5rb6R0M5/V1Ey3MBjME7g3cGOVIEV/VYe19OHpL1sIXPEbaA8T+8YMHNexArz4fjDuxlem6UubmHkq6OKY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=gYOU+NaL; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Received: by linux.microsoft.com (Postfix, from userid 1134) id 02CEA20B74C0; Fri, 1 Mar 2024 04:56:20 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 02CEA20B74C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1709297780; bh=+fycukGm4sgzp9r6OLPcfHk+mP0SxlL5O9Scws8TfrY=; h=From:To:Cc:Subject:Date:From; b=gYOU+NaLtDSP3z16XuiNI31t1vzv5XsWe0gnlPhAPOgkUF5LpWlXHHoBLICpbcHoP GWl43WOpaQJdj0aLHfZl8y1/5sMtaXJ5cWnFvdB+WN00FEF2SHoByLXHtTJ/bUlm5n cfSbsENOlVZoo3nHuOWD2qSGdlpNHkuonhrx7boE= From: Shradha Gupta To: linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org Cc: Shradha Gupta , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Michael Kelley , Olaf Hering , Ani Sinha , Shradha Gupta Subject: [PATCH] hv/hv_kvp_daemon: Handle IPv4 and Ipv6 combination for keyfile format Date: Fri, 1 Mar 2024 04:56:18 -0800 Message-Id: <1709297778-20420-1-git-send-email-shradhagupta@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792328645382909658 X-GMAIL-MSGID: 1792328645382909658 If the network configuration strings are passed as a combination of IPv and IPv6 addresses, the current KVP daemon doesnot handle it for the keyfile configuration format. With these changes, the keyfile config generation logic scans through the list twice to generate IPv4 and IPv6 sections for the configuration files to handle this support. Built-on: Rhel9 Tested-on: Rhel9(IPv4 only, IPv6 only, IPv4 and IPv6 combination) Signed-off-by: Shradha Gupta --- tools/hv/hv_kvp_daemon.c | 152 ++++++++++++++++++++++++++++----------- 1 file changed, 112 insertions(+), 40 deletions(-) diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 318e2dad27e0..7e84e40b55fb 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -76,6 +76,11 @@ enum { DNS }; +enum { + IPV4 = 1, + IPV6 +}; + static int in_hand_shake; static char *os_name = ""; @@ -1171,6 +1176,18 @@ static int process_ip_string(FILE *f, char *ip_string, int type) return 0; } +int ip_version_check(const char *input_addr) +{ + struct in6_addr addr; + + if (inet_pton(AF_INET, input_addr, &addr)) + return IPV4; + else if (inet_pton(AF_INET6, input_addr, &addr)) + return IPV6; + else + return -EINVAL; +} + /* * Only IPv4 subnet strings needs to be converted to plen * For IPv6 the subnet is already privided in plen format @@ -1197,14 +1214,56 @@ static int kvp_subnet_to_plen(char *subnet_addr_str) return plen; } +static int process_dns_gateway_nm(FILE *f, char *ip_string, int type, + int ip_sec) +{ + char addr[INET6_ADDRSTRLEN], *output_str; + int ip_offset = 0, error, ip_ver; + char *param_name; + + output_str = malloc(strlen(ip_string)); + + if (!output_str) + return 1; + + output_str[0] = '\0'; + + if (type == DNS) + param_name = "dns"; + else + param_name = "gateway"; + + while (parse_ip_val_buffer(ip_string, &ip_offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + ip_ver = ip_version_check(addr); + + if ((ip_ver == IPV4 && ip_sec == IPV4) || + (ip_ver == IPV6 && ip_sec == IPV6)) { + strcat(output_str, addr); + strcat(output_str, ","); + } else { + continue; + } + } + + if (strlen(output_str)) { + output_str[strlen(output_str) - 1] = '\0'; + error = fprintf(f, "%s=%s\n", param_name, output_str); + if (error < 0) + return error; + } + + return 0; +} + static int process_ip_string_nm(FILE *f, char *ip_string, char *subnet, - int is_ipv6) + int ip_sec) { char addr[INET6_ADDRSTRLEN]; char subnet_addr[INET6_ADDRSTRLEN]; int error, i = 0; int ip_offset = 0, subnet_offset = 0; - int plen; + int plen, ip_ver; memset(addr, 0, sizeof(addr)); memset(subnet_addr, 0, sizeof(subnet_addr)); @@ -1216,10 +1275,13 @@ static int process_ip_string_nm(FILE *f, char *ip_string, char *subnet, subnet_addr, (MAX_IP_ADDR_SIZE * 2))) { - if (!is_ipv6) + ip_ver = ip_version_check(addr); + if (ip_ver == IPV4 && ip_sec == IPV4) plen = kvp_subnet_to_plen((char *)subnet_addr); - else + else if (ip_ver == IPV6 && ip_sec == IPV6) plen = atoi(subnet_addr); + else + continue; if (plen < 0) return plen; @@ -1242,8 +1304,8 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) char if_filename[PATH_MAX]; char nm_filename[PATH_MAX]; FILE *ifcfg_file, *nmfile; + int ip_sections_count; char cmd[PATH_MAX]; - int is_ipv6 = 0; char *mac_addr; int str_len; @@ -1421,52 +1483,62 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) if (error) goto setval_error; - if (new_val->addr_family & ADDR_FAMILY_IPV6) { - error = fprintf(nmfile, "\n[ipv6]\n"); - if (error < 0) - goto setval_error; - is_ipv6 = 1; - } else { - error = fprintf(nmfile, "\n[ipv4]\n"); - if (error < 0) - goto setval_error; - } - /* - * Now we populate the keyfile format + * The keyfile format expects the IPv6 and IPv4 configuration in + * different sections. Therefore we iterate through the list twice, + * once to populate the IPv4 section and the next time for IPv6 */ + ip_sections_count = 1; + do { + if (ip_sections_count == 1) { + error = fprintf(nmfile, "\n[ipv4]\n"); + if (error < 0) + goto setval_error; + } else { + error = fprintf(nmfile, "\n[ipv6]\n"); + if (error < 0) + goto setval_error; + } - if (new_val->dhcp_enabled) { - error = kvp_write_file(nmfile, "method", "", "auto"); - if (error < 0) - goto setval_error; - } else { - error = kvp_write_file(nmfile, "method", "", "manual"); + /* + * Now we populate the keyfile format + */ + + if (new_val->dhcp_enabled) { + error = kvp_write_file(nmfile, "method", "", "auto"); + if (error < 0) + goto setval_error; + } else { + error = kvp_write_file(nmfile, "method", "", "manual"); + if (error < 0) + goto setval_error; + } + + /* + * Write the configuration for ipaddress, netmask, gateway and + * name services + */ + error = process_ip_string_nm(nmfile, (char *)new_val->ip_addr, + (char *)new_val->sub_net, + ip_sections_count); if (error < 0) goto setval_error; - } - /* - * Write the configuration for ipaddress, netmask, gateway and - * name services - */ - error = process_ip_string_nm(nmfile, (char *)new_val->ip_addr, - (char *)new_val->sub_net, is_ipv6); - if (error < 0) - goto setval_error; - - /* we do not want ipv4 addresses in ipv6 section and vice versa */ - if (is_ipv6 != is_ipv4((char *)new_val->gate_way)) { - error = fprintf(nmfile, "gateway=%s\n", (char *)new_val->gate_way); + error = process_dns_gateway_nm(nmfile, + (char *)new_val->gate_way, + GATEWAY, ip_sections_count); if (error < 0) goto setval_error; - } - if (is_ipv6 != is_ipv4((char *)new_val->dns_addr)) { - error = fprintf(nmfile, "dns=%s\n", (char *)new_val->dns_addr); + error = process_dns_gateway_nm(nmfile, + (char *)new_val->dns_addr, DNS, + ip_sections_count); if (error < 0) goto setval_error; - } + + ip_sections_count++; + } while (ip_sections_count <= 2); + fclose(nmfile); fclose(ifcfg_file);