On Thu, Mar 21, 2024 at 08:29:58PM +0530, Ani Sinha wrote:
>
>
> > On 21 Mar 2024, at 18:40, Shradha Gupta <shradhagupta@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > On Thu, Mar 21, 2024 at 05:36:05PM +0530, Ani Sinha wrote:
> >>
> >>
> >> On Thu, 21 Mar 2024, Ani Sinha wrote:
> >>
> >>>
> >>>
> >>>> On 21 Mar 2024, at 09:25, Ani Sinha <anisinha@xxxxxxxxxx> wrote:
> >>>>
> >>>>
> >>>>
> >>>>> On 20 Mar 2024, at 16:47, Shradha Gupta <shradhagupta@xxxxxxxxxxxxxxxxxxx> wrote:
> >>>>>
> >>>>> If the network configuration strings are passed as a combination of IPv4
> >>>>> and IPv6 addresses, the current KVP daemon does not handle processing 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.
> >>>>>
> >>>>> Testcases ran:Rhel 9, Hyper-V VMs
> >>>>> (IPv4 only, IPv6 only, IPv4 and IPv6 combination)
> >>>>> Signed-off-by: Shradha Gupta <shradhagupta@xxxxxxxxxxxxxxxxxxx>
> >>>>> ---
> >>>>> Changes in v4
> >>>>> * Removed the unnecessary memset for addr in the start
> >>>>> * Added a comment to describe how we erase the last comma character
> >>>>> * Fixed some typos in the commit description
> >>>>> * While using strncat, skip copying the '\0' character.
> >>>>> ---
> >>>>> tools/hv/hv_kvp_daemon.c | 181 ++++++++++++++++++++++++++++++---------
> >>>>> 1 file changed, 140 insertions(+), 41 deletions(-)
> >>>>>
> >>>>> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> >>>>> index 318e2dad27e0..d64d548a802f 100644
> >>>>> --- a/tools/hv/hv_kvp_daemon.c
> >>>>> +++ b/tools/hv/hv_kvp_daemon.c
> >>>>> @@ -76,6 +76,12 @@ enum {
> >>>>> DNS
> >>>>> };
> >>>>>
> >>>>> +enum {
> >>>>> + IPV4 = 1,
> >>>>> + IPV6,
> >>>>> + IP_TYPE_MAX
> >>>>> +};
> >>>>> +
> >>>>> static int in_hand_shake;
> >>>>>
> >>>>> static char *os_name = "";
> >>>>> @@ -102,6 +108,11 @@ static struct utsname uts_buf;
> >>>>>
> >>>>> #define MAX_FILE_NAME 100
> >>>>> #define ENTRIES_PER_BLOCK 50
> >>>>> +/*
> >>>>> + * Change this entry if the number of addresses increases in future
> >>>>> + */
> >>>>> +#define MAX_IP_ENTRIES 64
> >>>>> +#define OUTSTR_BUF_SIZE ((INET6_ADDRSTRLEN + 1) * MAX_IP_ENTRIES)
> >>>>>
> >>>>> struct kvp_record {
> >>>>> char key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
> >>>>> @@ -1171,6 +1182,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;
> >>>>> +
> >>>>> + return -EINVAL;
> >>>>> +}
> >>>>> +
> >>>>> /*
> >>>>> * Only IPv4 subnet strings needs to be converted to plen
> >>>>> * For IPv6 the subnet is already privided in plen format
> >>>>> @@ -1197,14 +1220,75 @@ 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 = 0, ip_ver;
> >>>>> + char *param_name;
> >>>>> +
> >>>>> + if (type == DNS)
> >>>>> + param_name = "dns";
> >>>>> + else if (type == GATEWAY)
> >>>>> + param_name = "gateway";
> >>>>> + else
> >>>>> + return -EINVAL;
> >>>>> +
> >>>>> + output_str = (char *)calloc(OUTSTR_BUF_SIZE, sizeof(char));
> >>>>> + if (!output_str)
> >>>>> + return -ENOMEM;
> >>>>> +
> >>>>> + while (1) {
> >>>>> + memset(addr, 0, sizeof(addr));
> >>>>> +
> >>>>> + if (!parse_ip_val_buffer(ip_string, &ip_offset, addr,
> >>>>> + (MAX_IP_ADDR_SIZE * 2)))
> >>>>> + break;
> >>>>> +
> >>>>> + ip_ver = ip_version_check(addr);
> >>>>> + if (ip_ver < 0)
> >>>>> + continue;
> >>>>> +
> >>>>> + if ((ip_ver == IPV4 && ip_sec == IPV4) ||
> >>>>> + (ip_ver == IPV6 && ip_sec == IPV6)) {
> >>>>> + /*
> >>>>> + * do a bound check to avoid out-of bound writes
> >>>>> + */
> >>>>> + if ((OUTSTR_BUF_SIZE - strlen(output_str)) >
> >>>>> + (strlen(addr) + 1)) {
> >>>>> + strncat(output_str, addr,
> >>>>> + OUTSTR_BUF_SIZE -
> >>>>> + strlen(output_str) - 1);
> >>>>> + strncat(output_str, ",",
> >>>>> + OUTSTR_BUF_SIZE -
> >>>>> + strlen(output_str) - 1);
> >>>>> + }
> >>>>> + } else {
> >>>>> + continue;
> >>>>> + }
> >>>>> + }
> >>>>> +
> >>>>> + if (strlen(output_str)) {
> >>>>> + /*
> >>>>> + * This is to get rid of that extra comma character
> >>>>> + * in the end of the string
> >>>>> + */
> >>>>> + output_str[strlen(output_str) - 1] = '\0';
> >>>>> + error = fprintf(f, "%s=%s\n", param_name, output_str);
> >>>>> + }
> >>>>> +
> >>>>> + free(output_str);
> >>>>> + return error;
> >>>>> +}
> >>>>> +
> >>>>> 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 +1300,16 @@ 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 < 0)
> >>>>> + continue;
> >>>>> +
> >>>>> + 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;
> >>>>> @@ -1238,12 +1328,11 @@ static int process_ip_string_nm(FILE *f, char *ip_string, char *subnet,
> >>>>>
> >>>>> static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
> >>>>> {
> >>>>> - int error = 0;
> >>>>> + int error = 0, ip_ver;
> >>>>> char if_filename[PATH_MAX];
> >>>>> char nm_filename[PATH_MAX];
> >>>>> FILE *ifcfg_file, *nmfile;
> >>>>> char cmd[PATH_MAX];
> >>>>> - int is_ipv6 = 0;
> >>>>> char *mac_addr;
> >>>>> int str_len;
> >>>>>
> >>>>> @@ -1421,52 +1510,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_ver = IPV4;
> >>>>> + do {
> >>>>> + if (ip_ver == IPV4) {
> >>>>> + 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;
> >>>>
> >>>> There is a problem with this code. dhcp_enabled is only valid for ipv4. From looking at ifcfg files that were generated before, I do not see IPV6_AUTOCONF related settings.
> >>>
> >>> So dhcp_enabled comes from running hv_get_shcp_info.sh which greps for ???dhcp??? in ifcfg files. If it is a hit, it sets dhcp_enabled to true.
> >>> The ifcfg files will have ???dhcp??? only if it???s set in BOOTPROTO=dhcp. So it is indeed ipv4 specific.
> >>>
> >>>> So maybe we should set method only for ipv4 and not for ipv6.
> >>
> >> After some internal testing, it seems we need to set some method for both,
> >> otherwise, nm is complaining. Therefore, I propose the following patch
> >>
> >>> From e1c3f4ece2c4bd191369582d84b8b508db5b5510 Mon Sep 17 00:00:00 2001
> >> From: Ani Sinha <anisinha@xxxxxxxxxx>
> >> Date: Thu, 21 Mar 2024 10:00:26 +0530
> >> Subject: [PATCH] Handle dhcp configuration properly for ipv4 and ipv6
> >>
> >> dhcp_enabled is only valid for ipv4. So do not set dhcp methods for ipv6 based
> >> on dhcp_enabled flag. For ipv4, set method to manual only when dhcp_enabled is
> >> false and specific ipv4 addresses are configured. If neither dhcp_enabled is
> >> true and no ipv4 addresses are configured, set method to 'disabled'.
> >>
> >> For ipv6, set method to manual when we configure ipv6 addresses. Otherwise set
> >> method to 'auto' so that SLAAC from RA may be used.
> >>
> >> Signed-off-by: Ani Sinha <anisinha@xxxxxxxxxx>
> >> ---
> >> hv_kvp_daemon.c | 57 +++++++++++++++++++++++++++++++++++--------------
> >> 1 file changed, 41 insertions(+), 16 deletions(-)
> >>
> >> diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
> >> index b368d3d..a0e6e4a 100644
> >> --- a/hv_kvp_daemon.c
> >> +++ b/hv_kvp_daemon.c
> >> @@ -1286,7 +1286,7 @@ static int process_ip_string_nm(FILE *f, char *ip_string, char *subnet,
> >> {
> >> char addr[INET6_ADDRSTRLEN];
> >> char subnet_addr[INET6_ADDRSTRLEN];
> >> - int error, i = 0;
> >> + int error = 0, i = 0;
> >> int ip_offset = 0, subnet_offset = 0;
> >> int plen, ip_ver;
> >>
> >> @@ -1323,7 +1323,7 @@ static int process_ip_string_nm(FILE *f, char *ip_string, char *subnet,
> >> memset(subnet_addr, 0, sizeof(subnet_addr));
> >> }
> >>
> >> - return 0;
> >> + return error;
> >> }
> >>
> >> static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
> >> @@ -1511,6 +1511,8 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
> >> 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
> >> @@ -1527,20 +1529,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
> >> goto setval_error;
> >> }
> >>
> >> - /*
> >> - * 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
> >> @@ -1551,6 +1539,43 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
> >> if (error < 0)
> >> goto setval_error;
> >>
> >> + if (ip_ver == IPV4) {
> >> + if (new_val->dhcp_enabled) {
> >> + error = kvp_write_file(nmfile, "method", "", "auto");
> >> + if (error < 0)
> >> + goto setval_error;
> >> + } else if (error) {
> >> + /* if ipv4 addresses were written, set method to 'manual' */
> >> + error = kvp_write_file(nmfile, "method", "", "manual");
> >> + if (error < 0)
> >> + goto setval_error;
> >> + } else {
> >> + /*
> >> + * if no ipv4 addresses were set and dhcp was not enabled,
> >> + * disable ipv4 configuration.
> >> + */
> >> + error = kvp_write_file(nmfile, "method", "", "disabled");
> >> + if (error < 0)
> >> + goto setval_error;
> >> + }
> >> +
> >> + } else if (ip_ver == IPV6) {
> >> + if (error) {
> >> + /* if ipv6 addresses were written, set method to 'manual' */
> >> + error = kvp_write_file(nmfile, "method", "", "manual");
> >> + if (error < 0)
> >> + goto setval_error;
> >> + } else {
> >> + /*
> >> + * By default for ipv6, set method to 'auto' so that
> >> + * SLAAC in RA can be used to configure the interface
> >> + */
> >> + error = kvp_write_file(nmfile, "method", "", "auto");
> >> + if (error < 0)
> >> + goto setval_error;
> >> + }
> >> + }
> >> +
> >> error = process_dns_gateway_nm(nmfile,
> >> (char *)new_val->gate_way,
> >> GATEWAY, ip_ver);
> >> --
> > Hi Ani,
> > Thanks, the proposed patch looks clean and would fix the problem at hand.
> > I was wondering if it would make more sense to implement the distro specific script
> > hv_get_dhcp_info.sh to include dhcp configuration for Ipv6 specific configuration
> > instead.
>
> The way I see it is that the daemon should provide some ???reasonable??? configuration for both ipv4 and ipv6. Then the distro specific script can override it in any way they see fit if required. Leaving out ipv6 would make it incomplete and half baked.
Sure, That makes sense. Let's go ahead with this then.
>
> >
> > I see for IPv6 the older ifcfg format also did not honor dhcp_enable flag, but how about
> > we add support for it starting with the keyfile format in the script.
> >
> > That way distro vendors could have more control over the logic to get dhcp_enable data
> > and it would be easier to change
> > Thoughts? Hope I am making sense :)
> >
> > Regards,
> > Shradha.
>
