From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, virtualization@lists.osdl.org,
olaf@aepfle.de, apw@canonical.com, ben@decadent.org.uk
Subject: [PATCH V3 12/14] Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO
Date: Thu, 16 Aug 2012 18:32:23 -0700 [thread overview]
Message-ID: <1345167145-5513-12-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1345167145-5513-1-git-send-email-kys@microsoft.com>
Now implement the KVP verb - KVP_OP_GET_IP_INFO. This operation retrieves IP
information for 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 | 93 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index bb2a6c4..e7db9ac 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -604,6 +604,69 @@ static char *kvp_if_name_to_mac(char *if_name)
}
+/*
+ * Retrieve the interface name given tha MAC address.
+ */
+
+static char *kvp_mac_to_if_name(char *mac)
+{
+ DIR *dir;
+ struct dirent *entry;
+ FILE *file;
+ char *p, *q, *x;
+ char *if_name = NULL;
+ char buf[256];
+ char *kvp_net_dir = "/sys/class/net/";
+ char dev_id[256];
+ int i;
+
+ dir = opendir(kvp_net_dir);
+ if (dir == NULL)
+ return NULL;
+
+ snprintf(dev_id, sizeof(dev_id), kvp_net_dir);
+ q = dev_id + strlen(kvp_net_dir);
+
+ while ((entry = readdir(dir)) != NULL) {
+ /*
+ * Set the state for the next pass.
+ */
+ *q = '\0';
+
+ strcat(dev_id, entry->d_name);
+ strcat(dev_id, "/address");
+
+ file = fopen(dev_id, "r");
+ if (file == NULL)
+ continue;
+
+ p = fgets(buf, sizeof(buf), file);
+ if (p) {
+ x = strchr(p, '\n');
+ if (x)
+ *x = '\0';
+
+ for (i = 0; i < strlen(p); i++)
+ p[i] = toupper(p[i]);
+
+ if (!strcmp(p, mac)) {
+ /*
+ * Found the MAC match; return the interface
+ * name. The caller will free the memory.
+ */
+ if_name = strdup(entry->d_name);
+ fclose(file);
+ break;
+ }
+ }
+ fclose(file);
+ }
+
+ closedir(dir);
+ return if_name;
+}
+
+
static void kvp_process_ipconfig_file(char *cmd,
char *config_buf, int len,
int element_size, int offset)
@@ -750,10 +813,10 @@ static int kvp_process_ip_address(void *addrp,
}
if ((length - *offset) < addr_length + 1)
- return 1;
+ return HV_E_FAIL;
if (str == NULL) {
strcpy(buffer, "inet_ntop failed\n");
- return 1;
+ return HV_E_FAIL;
}
if (*offset == 0)
strcpy(buffer, tmp);
@@ -797,7 +860,7 @@ kvp_get_ip_info(int family, char *if_name, int op,
if (getifaddrs(&ifap)) {
strcpy(buffer, "getifaddrs failed\n");
- return 1;
+ return HV_E_FAIL;
}
curp = ifap;
@@ -1387,6 +1450,30 @@ int main(void)
}
switch (op) {
+ case KVP_OP_GET_IP_INFO:
+ kvp_ip_val = &hv_msg->body.kvp_ip_val;
+ if_name =
+ kvp_mac_to_if_name((char *)kvp_ip_val->adapter_id);
+
+ if (if_name == NULL) {
+ /*
+ * We could not map the mac address to an
+ * interface name; return error.
+ */
+ hv_msg->error = HV_E_FAIL;
+ break;
+ }
+ error = kvp_get_ip_info(
+ 0, if_name, KVP_OP_GET_IP_INFO,
+ kvp_ip_val,
+ (MAX_IP_ADDR_SIZE * 2));
+
+ if (error)
+ hv_msg->error = error;
+
+ 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(
--
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,
olaf@aepfle.de, apw@canonical.com, ben@decadent.org.uk
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Subject: [PATCH V3 12/14] Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO
Date: Thu, 16 Aug 2012 18:32:23 -0700 [thread overview]
Message-ID: <1345167145-5513-12-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1345167145-5513-1-git-send-email-kys@microsoft.com>
Now implement the KVP verb - KVP_OP_GET_IP_INFO. This operation retrieves IP
information for 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 | 93 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index bb2a6c4..e7db9ac 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -604,6 +604,69 @@ static char *kvp_if_name_to_mac(char *if_name)
}
+/*
+ * Retrieve the interface name given tha MAC address.
+ */
+
+static char *kvp_mac_to_if_name(char *mac)
+{
+ DIR *dir;
+ struct dirent *entry;
+ FILE *file;
+ char *p, *q, *x;
+ char *if_name = NULL;
+ char buf[256];
+ char *kvp_net_dir = "/sys/class/net/";
+ char dev_id[256];
+ int i;
+
+ dir = opendir(kvp_net_dir);
+ if (dir == NULL)
+ return NULL;
+
+ snprintf(dev_id, sizeof(dev_id), kvp_net_dir);
+ q = dev_id + strlen(kvp_net_dir);
+
+ while ((entry = readdir(dir)) != NULL) {
+ /*
+ * Set the state for the next pass.
+ */
+ *q = '\0';
+
+ strcat(dev_id, entry->d_name);
+ strcat(dev_id, "/address");
+
+ file = fopen(dev_id, "r");
+ if (file == NULL)
+ continue;
+
+ p = fgets(buf, sizeof(buf), file);
+ if (p) {
+ x = strchr(p, '\n');
+ if (x)
+ *x = '\0';
+
+ for (i = 0; i < strlen(p); i++)
+ p[i] = toupper(p[i]);
+
+ if (!strcmp(p, mac)) {
+ /*
+ * Found the MAC match; return the interface
+ * name. The caller will free the memory.
+ */
+ if_name = strdup(entry->d_name);
+ fclose(file);
+ break;
+ }
+ }
+ fclose(file);
+ }
+
+ closedir(dir);
+ return if_name;
+}
+
+
static void kvp_process_ipconfig_file(char *cmd,
char *config_buf, int len,
int element_size, int offset)
@@ -750,10 +813,10 @@ static int kvp_process_ip_address(void *addrp,
}
if ((length - *offset) < addr_length + 1)
- return 1;
+ return HV_E_FAIL;
if (str == NULL) {
strcpy(buffer, "inet_ntop failed\n");
- return 1;
+ return HV_E_FAIL;
}
if (*offset == 0)
strcpy(buffer, tmp);
@@ -797,7 +860,7 @@ kvp_get_ip_info(int family, char *if_name, int op,
if (getifaddrs(&ifap)) {
strcpy(buffer, "getifaddrs failed\n");
- return 1;
+ return HV_E_FAIL;
}
curp = ifap;
@@ -1387,6 +1450,30 @@ int main(void)
}
switch (op) {
+ case KVP_OP_GET_IP_INFO:
+ kvp_ip_val = &hv_msg->body.kvp_ip_val;
+ if_name =
+ kvp_mac_to_if_name((char *)kvp_ip_val->adapter_id);
+
+ if (if_name == NULL) {
+ /*
+ * We could not map the mac address to an
+ * interface name; return error.
+ */
+ hv_msg->error = HV_E_FAIL;
+ break;
+ }
+ error = kvp_get_ip_info(
+ 0, if_name, KVP_OP_GET_IP_INFO,
+ kvp_ip_val,
+ (MAX_IP_ADDR_SIZE * 2));
+
+ if (error)
+ hv_msg->error = error;
+
+ 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(
--
1.7.4.1
next prev parent reply other threads:[~2012-08-17 1:32 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-17 1:31 [PATCH V3 00/14] drivers: hv: kvp K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 01/14] Drivers: hv: kvp: Support the new IP injection messages K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 02/14] Tools: hv: Prepare to expand kvp_get_ip_address() functionality K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 03/14] Tools: hv: Further refactor kvp_get_ip_address() K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 04/14] Tools: hv: Gather address family information K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 05/14] Tools: hv: Gather subnet information K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 06/14] Tools: hv: Represent the ipv6 mask using CIDR notation K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 07/14] Tools: hv: Gather ipv[4,6] gateway information K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 08/14] Tools: hv: Gather DNS information K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 16:51 ` Greg KH
2012-08-17 16:55 ` Greg KH
2012-08-17 17:07 ` KY Srinivasan
2012-08-17 17:17 ` Greg KH
2012-08-17 21:41 ` KY Srinivasan
2012-08-17 17:32 ` Ben Hutchings
2012-08-17 17:38 ` Greg KH
2012-08-17 17:51 ` Ben Hutchings
2012-08-17 17:55 ` KY Srinivasan
2012-08-17 17:46 ` KY Srinivasan
2012-08-17 18:27 ` Olaf Hering
2012-08-17 18:44 ` Ben Hutchings
2012-08-17 18:53 ` Olaf Hering
2012-08-22 8:50 ` Andy Whitcroft
2012-08-22 15:45 ` KY Srinivasan
2012-08-17 1:32 ` [PATCH V3 09/14] Tools: hv: Gather DHCP information K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 10/14] Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 11/14] Tools: hv: Rename the function kvp_get_ip_address() K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan [this message]
2012-08-17 1:32 ` [PATCH V3 12/14] Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 13/14] Tools: hv: Get rid of some unused variables K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan
2012-08-17 1:32 ` [PATCH V3 14/14] Tools: hv: Correctly type string variables K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. 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=1345167145-5513-12-git-send-email-kys@microsoft.com \
--to=kys@microsoft.com \
--cc=apw@canonical.com \
--cc=ben@decadent.org.uk \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olaf@aepfle.de \
--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: link
Be 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.