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 12/13] Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO
Date: Thu, 21 Jun 2012 14:31:44 -0700 [thread overview]
Message-ID: <1340314305-27126-12-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1340314305-27126-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 | 95 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index dcf67fa..569f4d7 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -41,6 +41,7 @@
#include <syslog.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <dirent.h>
/*
* KVP protocol: The user mode component first registers with the
@@ -490,6 +491,64 @@ done:
return;
}
+/*
+ * Retrieve an interface name corresponding to the specified guid.
+ * If there is a match, the function returns a pointer
+ * to the interface name and if not, a NULL is returned.
+ * If a match is found, the caller is responsible for
+ * freeing the memory.
+ */
+
+static char *kvp_get_if_name(char *guid, int guid_len)
+{
+ DIR *dir;
+ struct dirent *entry;
+ FILE *file;
+ char *p, *q;
+ char *if_name = NULL;
+ char buf[256];
+ char *kvp_net_dir = "/sys/class/net/";
+ char dev_id[100];
+
+ dir = opendir(kvp_net_dir);
+ if (dir == NULL)
+ return NULL;
+
+ memset(dev_id, 0, sizeof(dev_id));
+ strcat(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, "/device/device_id");
+
+ file = fopen(dev_id, "r");
+ if (file == NULL)
+ continue;
+
+ p = fgets(buf, sizeof(buf), file);
+ if (p) {
+ if (!strncmp(p, guid, guid_len)) {
+ /*
+ * Found the guid match; return the interface
+ * name. The caller will free the memory.
+ */
+ if_name = strdup(entry->d_name);
+ break;
+ }
+ }
+ fclose(file);
+ }
+
+ closedir(dir);
+ return if_name;
+}
+
+
static void kvp_process_ipconfig_file(char *config_file,
char *config_buf, int len,
int element_size, int offset)
@@ -651,7 +710,7 @@ static int kvp_process_ip_address(void *addrp,
}
static int
-kvp_get_ip_address(int family, char *if_name, int op,
+kvp_get_ip_info(int family, char *if_name, int op,
void *out_buffer, int length)
{
struct ifaddrs *ifap;
@@ -858,6 +917,10 @@ int main(void)
char *key_name;
int op;
int pool;
+ char *if_name;
+ struct hv_kvp_ipaddr_value *kvp_ip_val;
+
+
daemon(1, 0);
openlog("KVP", 0, LOG_USER);
@@ -959,6 +1022,32 @@ int main(void)
}
continue;
+ case KVP_OP_GET_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_get_ip_info(
+ 0, if_name, KVP_OP_GET_IP_INFO,
+ kvp_ip_val,
+ (MAX_IP_ADDR_SIZE * 2));
+
+ 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,
@@ -1026,12 +1115,12 @@ int main(void)
strcpy(key_value, lic_version);
break;
case NetworkAddressIPv4:
- kvp_get_ip_address(AF_INET, NULL, KVP_OP_ENUMERATE,
+ kvp_get_ip_info(AF_INET, NULL, KVP_OP_ENUMERATE,
key_value, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
strcpy(key_name, "NetworkAddressIPv4");
break;
case NetworkAddressIPv6:
- kvp_get_ip_address(AF_INET6, NULL, KVP_OP_ENUMERATE,
+ kvp_get_ip_info(AF_INET6, NULL, KVP_OP_ENUMERATE,
key_value, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
strcpy(key_name, "NetworkAddressIPv6");
break;
--
1.7.4.1
next prev parent reply other threads:[~2012-06-21 21:31 UTC|newest]
Thread overview: 31+ 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:31 ` [PATCH 01/13] Drivers: hv: Add KVP definitions for IP address injection 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 ` [PATCH 06/13] Tools: hv: Gather address family information 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 ` 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 21:39 ` Greg KH
2012-06-26 22:11 ` KY Srinivasan
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 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-06-21 23:30 ` Jesper Juhl
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-12-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox