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 06/14] Tools: hv: Represent the ipv6 mask using CIDR notation
Date: Thu, 16 Aug 2012 18:32:17 -0700 [thread overview]
Message-ID: <1345167145-5513-6-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1345167145-5513-1-git-send-email-kys@microsoft.com>
Transform ipv6 subnet information to CIDR notation.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
---
tools/hv/hv_kvp_daemon.c | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index de1724c..a63e83a 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -491,6 +491,15 @@ done:
return;
}
+static unsigned int hweight32(unsigned int *w)
+{
+ unsigned int res = *w - ((*w >> 1) & 0x55555555);
+ res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+ res = (res + (res >> 4)) & 0x0F0F0F0F;
+ res = res + (res >> 8);
+ return (res + (res >> 16)) & 0x000000FF;
+}
+
static int kvp_process_ip_address(void *addrp,
int family, char *buffer,
int length, int *offset)
@@ -535,10 +544,15 @@ kvp_get_ip_address(int family, char *if_name, int op,
struct ifaddrs *curp;
int offset = 0;
int sn_offset = 0;
- const char *str;
int error = 0;
char *buffer;
struct hv_kvp_ipaddr_value *ip_buffer;
+ char cidr_mask[5]; /* /xyz */
+ int weight;
+ int i;
+ unsigned int *w;
+ char *sn_str;
+ struct sockaddr_in6 *addr6;
if (op == KVP_OP_ENUMERATE) {
buffer = out_buffer;
@@ -611,18 +625,30 @@ kvp_get_ip_address(int family, char *if_name, int op,
goto gather_ipaddr;
} else {
ip_buffer->addr_family |= ADDR_FAMILY_IPV6;
+
/*
- * Get subnet info.
+ * Get subnet info in CIDR format.
*/
- error = kvp_process_ip_address(
- curp->ifa_netmask,
- AF_INET6,
- (char *)
- ip_buffer->sub_net,
- length,
- &sn_offset);
- if (error)
+ weight = 0;
+ sn_str = (char *)ip_buffer->sub_net;
+ addr6 = (struct sockaddr_in6 *)
+ curp->ifa_netmask;
+ w = addr6->sin6_addr.s6_addr32;
+
+ for (i = 0; i < 4; i++)
+ weight += hweight32(&w[i]);
+
+ sprintf(cidr_mask, "/%d", weight);
+ if ((length - sn_offset) <
+ (strlen(cidr_mask) + 1))
goto gather_ipaddr;
+
+ if (sn_offset == 0)
+ strcpy(sn_str, cidr_mask);
+ else
+ strcat(sn_str, cidr_mask);
+ strcat((char *)ip_buffer->sub_net, ";");
+ sn_offset += strlen(sn_str) + 1;
}
}
--
1.7.4.1
next prev parent reply other threads:[~2012-08-17 1:16 UTC|newest]
Thread overview: 30+ 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 ` [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 ` [PATCH V3 05/14] Tools: hv: Gather subnet information K. Y. Srinivasan
2012-08-17 1:32 ` K. Y. Srinivasan [this message]
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 ` [PATCH V3 08/14] Tools: hv: Gather DNS information 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 ` [PATCH V3 11/14] Tools: hv: Rename the function kvp_get_ip_address() K. Y. Srinivasan
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 ` [PATCH V3 14/14] Tools: hv: Correctly type string variables 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-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).