[PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work

[PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work

[Dexuan Cui]

In the case the host only injects an IPv6 address, the dhcp_enabled flag is
true (it's only for IPv4 according to Hyper-V host team), but we still need to
proceed to parse the IPv6 information.

Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Dexuan Cui <decui@microsoft.com>
---

v2: removed the distro-specific logic as Vitaly suggested.

 tools/hv/hv_kvp_daemon.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 6a6432a..4b3ee35 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -1308,16 +1308,17 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
 	if (error)
 		goto setval_error;
 
+	/*
+	 * The dhcp_enabled flag is only for IPv4. In the case the host only
+	 * injects an IPv6 address, the flag is true, but we still need to
+	 * proceed to parse and pass the IPv6 information to the
+	 * disto-specific script hv_set_ifconfig.
+	 */
 	if (new_val->dhcp_enabled) {
 		error = kvp_write_file(file, "BOOTPROTO", "", "dhcp");
 		if (error)
 			goto setval_error;
 
-		/*
-		 * We are done!.
-		 */
-		goto setval_done;
-
 	} else {
 		error = kvp_write_file(file, "BOOTPROTO", "", "none");
 		if (error)
@@ -1345,7 +1346,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
 	if (error)
 		goto setval_error;
 
-setval_done:
 	fclose(file);
 
 	/*
-- 
1.9.1

RE: [PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work

[Dexuan Cui]

> -----Original Message-----
> From: devel [mailto:driverdev-devel-bounces@linuxdriverproject.org] On
> Behalf Of Dexuan Cui
> Sent: Wednesday, December 10, 2014 19:33 PM
> To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org; driverdev-
> devel@linuxdriverproject.org; vkuznets@redhat.com; olaf@aepfle.de;
> apw@canonical.com; jasowang@redhat.com; KY Srinivasan
> Cc: Haiyang Zhang
> Subject: [PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work
> 
> In the case the host only injects an IPv6 address, the dhcp_enabled flag is
> true (it's only for IPv4 according to Hyper-V host team), but we still need to
> proceed to parse the IPv6 information.
> 
> Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
> Cc: K. Y. Srinivasan <kys@microsoft.com>
> Signed-off-by: Dexuan Cui <decui@microsoft.com>
> ---
> 
> v2: removed the distro-specific logic as Vitaly suggested.
> 
>  tools/hv/hv_kvp_daemon.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> index 6a6432a..4b3ee35 100644
> --- a/tools/hv/hv_kvp_daemon.c
> +++ b/tools/hv/hv_kvp_daemon.c
> @@ -1308,16 +1308,17 @@ static int kvp_set_ip_info(char *if_name, struct
> hv_kvp_ipaddr_value *new_val)
>  	if (error)
>  		goto setval_error;
> 
> +	/*
> +	 * The dhcp_enabled flag is only for IPv4. In the case the host only
> +	 * injects an IPv6 address, the flag is true, but we still need to
> +	 * proceed to parse and pass the IPv6 information to the
> +	 * disto-specific script hv_set_ifconfig.
> +	 */
>  	if (new_val->dhcp_enabled) {
>  		error = kvp_write_file(file, "BOOTPROTO", "", "dhcp");
>  		if (error)
>  			goto setval_error;
> 
> -		/*
> -		 * We are done!.
> -		 */
> -		goto setval_done;
> -
>  	} else {
>  		error = kvp_write_file(file, "BOOTPROTO", "", "none");
>  		if (error)
> @@ -1345,7 +1346,6 @@ static int kvp_set_ip_info(char *if_name, struct
> hv_kvp_ipaddr_value *new_val)
>  	if (error)
>  		goto setval_error;
> 
> -setval_done:
>  	fclose(file);
> 
>  	/*
> --
> 1.9.1

Hi Vitaly,
Can you please ACK the v2 patch?
Or, please let me know if you have new comments.

Thanks,
-- Dexuan

Re: [PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work

[Vitaly Kuznetsov]

Dexuan Cui <decui@microsoft.com> writes:

>> -----Original Message-----
>> From: devel [mailto:driverdev-devel-bounces@linuxdriverproject.org] On
>> Behalf Of Dexuan Cui
>> Sent: Wednesday, December 10, 2014 19:33 PM
>> To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org; driverdev-
>> devel@linuxdriverproject.org; vkuznets@redhat.com; olaf@aepfle.de;
>> apw@canonical.com; jasowang@redhat.com; KY Srinivasan
>> Cc: Haiyang Zhang
>> Subject: [PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work
>> 
>> In the case the host only injects an IPv6 address, the dhcp_enabled flag is
>> true (it's only for IPv4 according to Hyper-V host team), but we still need to
>> proceed to parse the IPv6 information.
>> 
>> Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
>> Cc: K. Y. Srinivasan <kys@microsoft.com>
>> Signed-off-by: Dexuan Cui <decui@microsoft.com>
>> ---
>> 
>> v2: removed the distro-specific logic as Vitaly suggested.
>> 
>>  tools/hv/hv_kvp_daemon.c | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>> 
>> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
>> index 6a6432a..4b3ee35 100644
>> --- a/tools/hv/hv_kvp_daemon.c
>> +++ b/tools/hv/hv_kvp_daemon.c
>> @@ -1308,16 +1308,17 @@ static int kvp_set_ip_info(char *if_name, struct
>> hv_kvp_ipaddr_value *new_val)
>>  	if (error)
>>  		goto setval_error;
>> 
>> +	/*
>> +	 * The dhcp_enabled flag is only for IPv4. In the case the host only
>> +	 * injects an IPv6 address, the flag is true, but we still need to
>> +	 * proceed to parse and pass the IPv6 information to the
>> +	 * disto-specific script hv_set_ifconfig.
>> +	 */

Actually we just relay what was recieved from the host and it's up to
distro-specific script how to interpret BOOTPROTO=dhcp now. Additional
IPv4 addresses (in case we receive them from our host) are not skipped
now as well.

>>  	if (new_val->dhcp_enabled) {
>>  		error = kvp_write_file(file, "BOOTPROTO", "", "dhcp");
>>  		if (error)
>>  			goto setval_error;
>> 
>> -		/*
>> -		 * We are done!.
>> -		 */
>> -		goto setval_done;
>> -
>>  	} else {
>>  		error = kvp_write_file(file, "BOOTPROTO", "", "none");
>>  		if (error)
>> @@ -1345,7 +1346,6 @@ static int kvp_set_ip_info(char *if_name, struct
>> hv_kvp_ipaddr_value *new_val)
>>  	if (error)
>>  		goto setval_error;
>> 
>> -setval_done:
>>  	fclose(file);
>> 
>>  	/*
>> --
>> 1.9.1
>
> Hi Vitaly,
> Can you please ACK the v2 patch?

Sorry it took me so long to reply, last 3 weeks I was on vacation. I'm
not particulary sure I'm in charge here to give an ACK :-), but 

Reviewed-By: Vitaly Kuznetsov <vkuznets@redhat.com>

> Or, please let me know if you have new comments.
>
> Thanks,
> -- Dexuan

-- 
  Vitaly

RE: [PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work

[Dexuan Cui]

> -----Original Message-----
> From: Vitaly Kuznetsov [mailto:vkuznets@redhat.com]
> Sent: Friday, January 2, 2015 22:51 PM
> To: Dexuan Cui
> Cc: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org; driverdev-
> devel@linuxdriverproject.org; olaf@aepfle.de; apw@canonical.com;
> jasowang@redhat.com; KY Srinivasan; Haiyang Zhang
> Subject: Re: [PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection
> work
> 
> Dexuan Cui <decui@microsoft.com> writes:
> 
> >> -----Original Message-----
> >> From: devel [mailto:driverdev-devel-bounces@linuxdriverproject.org] On
> >> Behalf Of Dexuan Cui
> >> Sent: Wednesday, December 10, 2014 19:33 PM
> >> To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> driverdev-
> >> devel@linuxdriverproject.org; vkuznets@redhat.com; olaf@aepfle.de;
> >> apw@canonical.com; jasowang@redhat.com; KY Srinivasan
> >> Cc: Haiyang Zhang
> >> Subject: [PATCH v2] tools: hv: kvp_daemon: make IPv6-only-injection work
> >>
> >> In the case the host only injects an IPv6 address, the dhcp_enabled flag is
> >> true (it's only for IPv4 according to Hyper-V host team), but we still need
> to
> >> proceed to parse the IPv6 information.
> >>
> >> Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
> >> Cc: K. Y. Srinivasan <kys@microsoft.com>
> >> Signed-off-by: Dexuan Cui <decui@microsoft.com>
> >> ---
> >>
> >> v2: removed the distro-specific logic as Vitaly suggested.
> >>
> >>  tools/hv/hv_kvp_daemon.c | 12 ++++++------
> >>  1 file changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> >> index 6a6432a..4b3ee35 100644
> >> --- a/tools/hv/hv_kvp_daemon.c
> >> +++ b/tools/hv/hv_kvp_daemon.c
> >> @@ -1308,16 +1308,17 @@ static int kvp_set_ip_info(char *if_name,
> struct
> >> hv_kvp_ipaddr_value *new_val)
> >>  	if (error)
> >>  		goto setval_error;
> >>
> >> +	/*
> >> +	 * The dhcp_enabled flag is only for IPv4. In the case the host only
> >> +	 * injects an IPv6 address, the flag is true, but we still need to
> >> +	 * proceed to parse and pass the IPv6 information to the
> >> +	 * disto-specific script hv_set_ifconfig.
> >> +	 */
> 
> Actually we just relay what was recieved from the host and it's up to
> distro-specific script how to interpret BOOTPROTO=dhcp now. Additional
> IPv4 addresses (in case we receive them from our host) are not skipped
> now as well.
Yes.

> 
> >>  	if (new_val->dhcp_enabled) {
> >>  		error = kvp_write_file(file, "BOOTPROTO", "", "dhcp");
> >>  		if (error)
> >>  			goto setval_error;
> >>
> >> -		/*
> >> -		 * We are done!.
> >> -		 */
> >> -		goto setval_done;
> >> -
> >>  	} else {
> >>  		error = kvp_write_file(file, "BOOTPROTO", "", "none");
> >>  		if (error)
> >> @@ -1345,7 +1346,6 @@ static int kvp_set_ip_info(char *if_name, struct
> >> hv_kvp_ipaddr_value *new_val)
> >>  	if (error)
> >>  		goto setval_error;
> >>
> >> -setval_done:
> >>  	fclose(file);
> >>
> >>  	/*
> >> --
> >> 1.9.1
> >
> > Hi Vitaly,
> > Can you please ACK the v2 patch?
> 
> Sorry it took me so long to reply, last 3 weeks I was on vacation. I'm
> not particulary sure I'm in charge here to give an ACK :-), but
It's OK. :-)

Thanks, Vitaly!

> 
> Reviewed-By: Vitaly Kuznetsov <vkuznets@redhat.com>
> 
> > Or, please let me know if you have new comments.
> >

Greg,  may  I have your comment, or do you need me to resend the
patch since it was last sent  3+ weeks ago?

Thanks,
-- Dexuan