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
Subject: [PATCH 08/15] Tools: hv: Gather subnet information
Date: Sat, 14 Jul 2012 13:34:13 -0700 [thread overview]
Message-ID: <1342298060-12662-8-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1342298060-12662-1-git-send-email-kys@microsoft.com>
Now gather sub-net 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 | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index f687fa5..07f6f7c 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -533,6 +533,7 @@ kvp_get_ip_address(int family, char *if_name, int op,
struct ifaddrs *ifap;
struct ifaddrs *curp;
int offset = 0;
+ int sn_offset = 0;
const char *str;
int error = 0;
char *buffer;
@@ -593,12 +594,38 @@ kvp_get_ip_address(int family, char *if_name, int op,
* Gather info other than the IP address.
* IP address info will be gathered later.
*/
- if (curp->ifa_addr->sa_family == AF_INET)
+ if (curp->ifa_addr->sa_family == AF_INET) {
ip_buffer->addr_family |= ADDR_FAMILY_IPV4;
- else
+ /*
+ * Get subnet info.
+ */
+ error = kvp_process_ip_address(
+ curp->ifa_netmask,
+ AF_INET,
+ (char *)
+ ip_buffer->sub_net,
+ length,
+ &sn_offset);
+ if (error)
+ goto gather_ipaddr;
+ } else {
ip_buffer->addr_family |= ADDR_FAMILY_IPV6;
+ /*
+ * Get subnet info.
+ */
+ error = kvp_process_ip_address(
+ curp->ifa_netmask,
+ AF_INET6,
+ (char *)
+ ip_buffer->sub_net,
+ length,
+ &sn_offset);
+ if (error)
+ goto gather_ipaddr;
+ }
}
+gather_ipaddr:
error = kvp_process_ip_address(curp->ifa_addr,
curp->ifa_addr->sa_family,
buffer,
--
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
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Subject: [PATCH 08/15] Tools: hv: Gather subnet information
Date: Sat, 14 Jul 2012 13:34:13 -0700 [thread overview]
Message-ID: <1342298060-12662-8-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1342298060-12662-1-git-send-email-kys@microsoft.com>
Now gather sub-net 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 | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index f687fa5..07f6f7c 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -533,6 +533,7 @@ kvp_get_ip_address(int family, char *if_name, int op,
struct ifaddrs *ifap;
struct ifaddrs *curp;
int offset = 0;
+ int sn_offset = 0;
const char *str;
int error = 0;
char *buffer;
@@ -593,12 +594,38 @@ kvp_get_ip_address(int family, char *if_name, int op,
* Gather info other than the IP address.
* IP address info will be gathered later.
*/
- if (curp->ifa_addr->sa_family == AF_INET)
+ if (curp->ifa_addr->sa_family == AF_INET) {
ip_buffer->addr_family |= ADDR_FAMILY_IPV4;
- else
+ /*
+ * Get subnet info.
+ */
+ error = kvp_process_ip_address(
+ curp->ifa_netmask,
+ AF_INET,
+ (char *)
+ ip_buffer->sub_net,
+ length,
+ &sn_offset);
+ if (error)
+ goto gather_ipaddr;
+ } else {
ip_buffer->addr_family |= ADDR_FAMILY_IPV6;
+ /*
+ * Get subnet info.
+ */
+ error = kvp_process_ip_address(
+ curp->ifa_netmask,
+ AF_INET6,
+ (char *)
+ ip_buffer->sub_net,
+ length,
+ &sn_offset);
+ if (error)
+ goto gather_ipaddr;
+ }
}
+gather_ipaddr:
error = kvp_process_ip_address(curp->ifa_addr,
curp->ifa_addr->sa_family,
buffer,
--
1.7.4.1
next prev parent reply other threads:[~2012-07-14 20:34 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-14 20:32 [PATCH 00/15] drivers: hv: kvp K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 01/15] Drivers: hv: Format GUIDS as per MSFT standards K. Y. Srinivasan
2012-07-14 20:24 ` Joe Perches
2012-07-14 23:23 ` KY Srinivasan
2012-07-14 23:23 ` KY Srinivasan
2012-07-14 23:28 ` Joe Perches
2012-07-14 23:28 ` Joe Perches
2012-07-14 20:34 ` [PATCH 02/15] Drivers: hv: Add KVP definitions for IP address injection K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-17 4:09 ` Olaf Hering
2012-07-17 16:05 ` Greg KH
2012-07-17 17:39 ` KY Srinivasan
2012-07-14 20:34 ` [PATCH 03/15] Drivers: hv: kvp: Cleanup error handling in KVP K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 04/15] Drivers: hv: kvp: Support the new IP injection messages K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 05/15] Tools: hv: Prepare to expand kvp_get_ip_address() functionality K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 06/15] Tools: hv: Further refactor kvp_get_ip_address() K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 07/15] Tools: hv: Gather address family information K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan [this message]
2012-07-14 20:34 ` [PATCH 08/15] Tools: hv: Gather subnet information K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 09/15] Tools: hv: Represent the ipv6 mask using CIDR notation K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 10/15] Tools: hv: Gather ipv[4,6] gateway information K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 11/15] Tools: hv: Gather DNS information K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 12/15] Tools: hv: Gather DHCP information K. Y. Srinivasan
2012-07-14 21:36 ` richard -rw- weinberger
2012-07-14 23:02 ` KY Srinivasan
2012-07-14 23:02 ` KY Srinivasan
2012-07-14 23:04 ` richard -rw- weinberger
2012-07-14 23:04 ` richard -rw- weinberger
2012-07-14 20:34 ` [PATCH 13/15] Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO K. Y. Srinivasan
2012-07-14 20:34 ` K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 14/15] Tools: hv: Rename the function kvp_get_ip_address() K. Y. Srinivasan
2012-07-14 20:34 ` [PATCH 15/15] Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO K. Y. Srinivasan
2012-07-17 16:04 ` [PATCH 01/15] Drivers: hv: Format GUIDS as per MSFT standards Greg KH
2012-07-17 16:19 ` Joe Perches
2012-07-17 16:19 ` Joe Perches
2012-07-17 16:32 ` Greg KH
2012-07-17 16:32 ` Greg KH
2012-07-17 17:42 ` KY Srinivasan
2012-07-17 17:42 ` 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=1342298060-12662-8-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=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.