From: "K. Y. Srinivasan" <kys@microsoft.com> To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, virtualization@lists.osdl.org, ohering@suse.com, apw@canonical.com Cc: "K. Y. Srinivasan" <kys@microsoft.com> Subject: [PATCH 13/13] Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO Date: Thu, 21 Jun 2012 14:31:45 -0700 [thread overview] Message-ID: <1340314305-27126-13-git-send-email-kys@microsoft.com> (raw) In-Reply-To: <1340314305-27126-1-git-send-email-kys@microsoft.com> Implement the KVP_OP_SET_IP_INFO verb. This operation sets the IP information on the specified interface. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com> --- tools/hv/hv_kvp_daemon.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 198 insertions(+), 0 deletions(-) diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 569f4d7..8eefdb5 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -847,6 +847,183 @@ getaddr_done: return error; } +int parse_ip_val_buffer(char *in_buf, int *offset, char *out_buf, int out_len) +{ + int end; + char *x; + char *start; + + /* + * in_buf has sequence of characters that are seperated by + * the character ';'. The last sequence is terminated by ';'. + */ + start = in_buf + *offset; + + x = strchr(start, ';'); + if (x) { + *x = 0; + if ((x - start) <= out_len) { + strcpy(out_buf, start); + strcat(out_buf, "\n"); + *offset = (x - start) + 1; + return 1; + } + } + return 0; +} + +static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) +{ + int error = 0; + char if_path[256]; + char if_tmp_path[256]; + FILE *file; + char addr[INET6_ADDRSTRLEN]; + int i; + char cmd[256]; + char str[256]; + int offset; + + /* + * Set the specified info in the appropriate config file + * for the specified interface and flush the settings. + * Currently we support distributions that maintain + * network configuration information in file: + * /etc/sysconfig/network-scripts/icfg-ifname + */ + memset(if_path, 0, sizeof(if_path)); + strcat(if_path, "/etc/sysconfig/network-scripts/ifcfg-"); + strcat(if_path, if_name); + + memset(if_tmp_path, 0, sizeof(if_tmp_path)); + strcat(if_tmp_path, "/var/opt/hyperv/.kvp_ifcfg-"); + strcat(if_tmp_path, if_name); + + file = fopen(if_path, "r"); + if (file == NULL) { + /* + * This system maintains the interface configuration + * information in a different location. Need to add + * code to deal with that. For now fail the operation. + */ + return 1; + } + + fclose(file); + /* + * The host gives us complete configuration information for the + * interface; just overwrite the current info. + * To deal with intermediate failues, first write a temp file. + */ + + file = fopen(if_tmp_path, "w"); + + if (file == NULL) + return 1; + + if (new_val->dhcp_enabled) { + error = fputs("BOOTPROTO=dhcp\n", file); + if (error == EOF) + goto setval_error; + + /* + * We are done!. + */ + goto setval_done; + } + + /* + * Write the configuration for ipaddress, netmask, gateway and + * name servers. + */ + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->ip_addr, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "IPADDR_%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->sub_net, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "NETMAK_%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->gate_way, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "GATEWAY_%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->dns_addr, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "DNS%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + error = fputs("ONBOOT=yes\n", file); + if (error == EOF) + goto setval_error; + + error = fputs("PEERDNS=yes\n", file); + if (error == EOF) + goto setval_error; + +setval_done: + /* + * Now move the config file to the final location. + */ + fclose(file); + memset(cmd, 0, sizeof(cmd)); + strcat(cmd, "mv "); + strcat(cmd, if_tmp_path); + strcat(cmd, " "); + strcat(cmd, if_path); + system(cmd); + + /* + * Now restart the network to flush the parameters. + */ + memset(cmd, 0, sizeof(cmd)); + strcat(cmd, "service network restart"); + system(cmd); + return 0; + +setval_error: + fclose(file); + return error; +} static int kvp_get_domain_name(char *buffer, int length) @@ -1048,6 +1225,27 @@ int main(void) free(if_name); break; + case KVP_OP_SET_IP_INFO: + kvp_ip_val = &hv_msg->body.kvp_ip_val; + if_name = kvp_get_if_name( + (char *)kvp_ip_val->adapter_id, + MAX_ADAPTER_ID_SIZE); + if (if_name == NULL) { + /* + * We could not map the guid to an + * interface name; return error. + */ + *((int *)(&hv_msg->kvp_hdr.operation)) = + HV_ERROR_DEVICE_NOT_CONNECTED; + break; + } + error = kvp_set_ip_info(if_name, kvp_ip_val); + if (error) + *((int *)(&hv_msg->kvp_hdr.operation)) = + HV_ERROR_DEVICE_NOT_CONNECTED; + + free(if_name); + break; case KVP_OP_SET: if (kvp_key_add_or_modify(hv_msg->kvp_hdr.pool, hv_msg->body.kvp_set.data.key, -- 1.7.4.1
WARNING: multiple messages have this Message-ID (diff)
From: "K. Y. Srinivasan" <kys@microsoft.com> To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, virtualization@lists.osdl.org, ohering@suse.com, apw@canonical.com Subject: [PATCH 13/13] Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO Date: Thu, 21 Jun 2012 14:31:45 -0700 [thread overview] Message-ID: <1340314305-27126-13-git-send-email-kys@microsoft.com> (raw) In-Reply-To: <1340314305-27126-1-git-send-email-kys@microsoft.com> Implement the KVP_OP_SET_IP_INFO verb. This operation sets the IP information on the specified interface. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com> --- tools/hv/hv_kvp_daemon.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 198 insertions(+), 0 deletions(-) diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 569f4d7..8eefdb5 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -847,6 +847,183 @@ getaddr_done: return error; } +int parse_ip_val_buffer(char *in_buf, int *offset, char *out_buf, int out_len) +{ + int end; + char *x; + char *start; + + /* + * in_buf has sequence of characters that are seperated by + * the character ';'. The last sequence is terminated by ';'. + */ + start = in_buf + *offset; + + x = strchr(start, ';'); + if (x) { + *x = 0; + if ((x - start) <= out_len) { + strcpy(out_buf, start); + strcat(out_buf, "\n"); + *offset = (x - start) + 1; + return 1; + } + } + return 0; +} + +static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) +{ + int error = 0; + char if_path[256]; + char if_tmp_path[256]; + FILE *file; + char addr[INET6_ADDRSTRLEN]; + int i; + char cmd[256]; + char str[256]; + int offset; + + /* + * Set the specified info in the appropriate config file + * for the specified interface and flush the settings. + * Currently we support distributions that maintain + * network configuration information in file: + * /etc/sysconfig/network-scripts/icfg-ifname + */ + memset(if_path, 0, sizeof(if_path)); + strcat(if_path, "/etc/sysconfig/network-scripts/ifcfg-"); + strcat(if_path, if_name); + + memset(if_tmp_path, 0, sizeof(if_tmp_path)); + strcat(if_tmp_path, "/var/opt/hyperv/.kvp_ifcfg-"); + strcat(if_tmp_path, if_name); + + file = fopen(if_path, "r"); + if (file == NULL) { + /* + * This system maintains the interface configuration + * information in a different location. Need to add + * code to deal with that. For now fail the operation. + */ + return 1; + } + + fclose(file); + /* + * The host gives us complete configuration information for the + * interface; just overwrite the current info. + * To deal with intermediate failues, first write a temp file. + */ + + file = fopen(if_tmp_path, "w"); + + if (file == NULL) + return 1; + + if (new_val->dhcp_enabled) { + error = fputs("BOOTPROTO=dhcp\n", file); + if (error == EOF) + goto setval_error; + + /* + * We are done!. + */ + goto setval_done; + } + + /* + * Write the configuration for ipaddress, netmask, gateway and + * name servers. + */ + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->ip_addr, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "IPADDR_%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->sub_net, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "NETMAK_%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->gate_way, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "GATEWAY_%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + i = 0; + offset = 0; + memset(addr, 0, sizeof(addr)); + memset(str, 0, sizeof(str)); + + while (parse_ip_val_buffer((char *)new_val->dns_addr, &offset, addr, + (MAX_IP_ADDR_SIZE * 2))) { + sprintf(str, "DNS%d=", i++); + strcat(str, addr); + error = fputs(str, file); + if (error == EOF) + goto setval_error; + } + + error = fputs("ONBOOT=yes\n", file); + if (error == EOF) + goto setval_error; + + error = fputs("PEERDNS=yes\n", file); + if (error == EOF) + goto setval_error; + +setval_done: + /* + * Now move the config file to the final location. + */ + fclose(file); + memset(cmd, 0, sizeof(cmd)); + strcat(cmd, "mv "); + strcat(cmd, if_tmp_path); + strcat(cmd, " "); + strcat(cmd, if_path); + system(cmd); + + /* + * Now restart the network to flush the parameters. + */ + memset(cmd, 0, sizeof(cmd)); + strcat(cmd, "service network restart"); + system(cmd); + return 0; + +setval_error: + fclose(file); + return error; +} static int kvp_get_domain_name(char *buffer, int length) @@ -1048,6 +1225,27 @@ int main(void) free(if_name); break; + case KVP_OP_SET_IP_INFO: + kvp_ip_val = &hv_msg->body.kvp_ip_val; + if_name = kvp_get_if_name( + (char *)kvp_ip_val->adapter_id, + MAX_ADAPTER_ID_SIZE); + if (if_name == NULL) { + /* + * We could not map the guid to an + * interface name; return error. + */ + *((int *)(&hv_msg->kvp_hdr.operation)) = + HV_ERROR_DEVICE_NOT_CONNECTED; + break; + } + error = kvp_set_ip_info(if_name, kvp_ip_val); + if (error) + *((int *)(&hv_msg->kvp_hdr.operation)) = + HV_ERROR_DEVICE_NOT_CONNECTED; + + free(if_name); + break; case KVP_OP_SET: if (kvp_key_add_or_modify(hv_msg->kvp_hdr.pool, hv_msg->body.kvp_set.data.key, -- 1.7.4.1
next prev parent reply other threads:[~2012-06-21 21:25 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-21 21:30 [PATCH 00/13] drivers: hv: kvp K. Y. Srinivasan 2012-06-21 21:30 ` K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 01/13] Drivers: hv: Add KVP definitions for IP address injection K. Y. Srinivasan 2012-06-21 21:31 ` K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 02/13] Drivers: hv: kvp: Cleanup error handling in KVP K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 03/13] Drivers: hv: kvp: Support the new IP injection messages K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 04/13] Tools: hv: Prepare to expand kvp_get_ip_address() functionality K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 05/13] Tools: hv: Further refactor kvp_get_ip_address() K. Y. Srinivasan 2012-06-21 21:31 ` K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 06/13] Tools: hv: Gather address family information K. Y. Srinivasan 2012-06-21 21:31 ` K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 07/13] Tools: hv: Gather subnet information K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 08/13] Tools: hv: Represent the ipv6 mask using CIDR notation K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 09/13] Tools: hv: Gather DNS information K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 10/13] Tools: hv: Gather ipv[4,6] gateway information K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 11/13] Tools: hv: Gather dhcp information K. Y. Srinivasan 2012-06-21 21:31 ` [PATCH 12/13] Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO K. Y. Srinivasan 2012-06-21 21:31 ` K. Y. Srinivasan [this message] 2012-06-21 21:31 ` [PATCH 13/13] Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO K. Y. Srinivasan 2012-06-21 22:47 ` [PATCH 00/13] drivers: hv: kvp Greg KH 2012-06-22 13:06 ` KY Srinivasan 2012-06-22 13:25 ` Greg KH 2012-06-26 2:29 ` KY Srinivasan 2012-06-26 2:29 ` KY Srinivasan 2012-06-26 21:39 ` Greg KH 2012-06-26 22:11 ` KY Srinivasan 2012-06-26 22:11 ` KY Srinivasan 2012-06-26 22:22 ` Greg KH 2012-06-26 22:22 ` Greg KH 2012-06-26 22:28 ` KY Srinivasan 2012-06-26 23:44 ` Greg KH 2012-06-28 14:23 ` Olaf Hering 2012-07-02 15:22 ` KY Srinivasan 2012-07-02 15:22 ` KY Srinivasan 2012-07-02 19:57 ` Ben Hutchings 2012-07-03 15:24 ` KY Srinivasan 2012-07-22 2:50 ` Ben Hutchings 2012-07-22 15:08 ` KY Srinivasan 2012-07-22 15:08 ` KY Srinivasan 2012-07-03 13:20 ` Olaf Hering 2012-07-03 15:03 ` Stephen Hemminger 2012-07-03 15:35 ` KY Srinivasan 2012-07-03 15:35 ` KY Srinivasan 2012-07-03 15:32 ` KY Srinivasan 2012-07-03 15:32 ` KY Srinivasan 2012-06-21 23:30 ` Jesper Juhl 2012-06-22 18:54 ` KY Srinivasan 2012-06-22 18:54 ` KY Srinivasan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1340314305-27126-13-git-send-email-kys@microsoft.com \ --to=kys@microsoft.com \ --cc=apw@canonical.com \ --cc=devel@linuxdriverproject.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ohering@suse.com \ --cc=virtualization@lists.osdl.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.