From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337Ab2HMQwq (ORCPT ); Mon, 13 Aug 2012 12:52:46 -0400 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:55587 "HELO p3plsmtps2ded02-02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752935Ab2HMQus (ORCPT ); Mon, 13 Aug 2012 12:50:48 -0400 From: "K. Y. Srinivasan" 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" Subject: [PATCH V2 08/18] Tools: hv: Gather subnet information Date: Mon, 13 Aug 2012 10:06:57 -0700 Message-Id: <1344877627-21779-8-git-send-email-kys@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1344877627-21779-1-git-send-email-kys@microsoft.com> References: <1344877584-21738-1-git-send-email-kys@microsoft.com> <1344877627-21779-1-git-send-email-kys@microsoft.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now, gather sub-net information for the specified interface. Signed-off-by: K. Y. Srinivasan Reviewed-by: Haiyang Zhang Reviewed-by: Olaf Hering Reviewed-by: Ben Hutchings --- 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 13ae098..de1724c 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -534,6 +534,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; @@ -594,12 +595,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