From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752107Ab1JLB2q (ORCPT ); Tue, 11 Oct 2011 21:28:46 -0400 Received: from smtp-out.google.com ([216.239.44.51]:11257 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750858Ab1JLB2p (ORCPT ); Tue, 11 Oct 2011 21:28:45 -0400 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=TvLiTS5Vston0u4Ee13k2KIHtkD6cuDAkGXv5nSSlFLeCu8hIPOAYeBDCuTYgKT/n t7yYpSkHo+0vTLxLL6Ong== From: Muraliraja Muniraju To: "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Murali Raja Subject: [PATCH v3] net-netlink: Add a new attribute to expose TOS values via netlink Date: Tue, 11 Oct 2011 18:28:07 -0700 Message-Id: <1318382887-31824-1-git-send-email-muralira@google.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <20111010145206.6f7e9ee2@nehalam.linuxnetplumber.net> References: <20111010145206.6f7e9ee2@nehalam.linuxnetplumber.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Murali Raja This patch exposes the tos value for the TCP sockets when the TOS flag is requested in the ext_flags for the inet_diag request. This would mainly be used to expose TOS values for both for TCP and UDP sockets. Currently it is supported for TCP. When netlink support for UDP would be added the support to expose the TOS values would alse be done. Signed-off-by: Murali Raja --- Changelog since v2: - Adding support for IPV6 class and using right API's Changelog since v1: - Removing reserved field include/linux/inet_diag.h | 9 ++++++++- net/ipv4/inet_diag.c | 5 +++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index bc8c490..e36093d 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h @@ -97,9 +97,10 @@ enum { INET_DIAG_INFO, INET_DIAG_VEGASINFO, INET_DIAG_CONG, + INET_DIAG_TOS, }; -#define INET_DIAG_MAX INET_DIAG_CONG +#define INET_DIAG_MAX INET_DIAG_TOS /* INET_DIAG_MEM */ @@ -120,6 +121,12 @@ struct tcpvegas_info { __u32 tcpv_minrtt; }; +/* INET_DIAG_TOS */ + +struct inet_diag_tos { + __u8 idiag_tos; +}; + #ifdef __KERNEL__ struct sock; struct inet_hashinfo; diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 389a2e6..f5e2bda 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -108,6 +108,9 @@ static int inet_csk_diag_fill(struct sock *sk, icsk->icsk_ca_ops->name); } + if ((ext & (1 << (INET_DIAG_TOS - 1))) && (sk->sk_family != AF_INET6)) + RTA_PUT_U8(skb, INET_DIAG_TOS, inet->tos); + r->idiag_family = sk->sk_family; r->idiag_state = sk->sk_state; r->idiag_timer = 0; @@ -130,6 +133,8 @@ static int inet_csk_diag_fill(struct sock *sk, &np->rcv_saddr); ipv6_addr_copy((struct in6_addr *)r->id.idiag_dst, &np->daddr); + if (ext & (1 << (INET_DIAG_TOS - 1))) + RTA_PUT_U8(skb, INET_DIAG_TOS, np->tclass); } #endif -- 1.7.3.1