From patchwork Sun Dec 15 12:10:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Paasch X-Patchwork-Id: 301342 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CF6412C009A for ; Sun, 15 Dec 2013 23:11:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754363Ab3LOMLb (ORCPT ); Sun, 15 Dec 2013 07:11:31 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:38502 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754443Ab3LOMLM (ORCPT ); Sun, 15 Dec 2013 07:11:12 -0500 Received: by mail-ee0-f46.google.com with SMTP id d49so1667181eek.33 for ; Sun, 15 Dec 2013 04:11:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BZ7ZPfFlWPsvtWKbDFudHuPwTb9uSdh8kYPNCbarJx4=; b=uYcKwU3caNySPUw6EnmNaO8uWz/kTJL74ESm+fD0sGLdoa4RkrUt5SmAdY+UtclAs4 QJ9/ceI9FEnseJAKk1sebPClGURs5jHvlwILvow5eGnkiss9rWPQLDkNA7NPAJRAS0f6 7+zeiuFA4h9djepV83xEr1mRexhFF//GqYyCfUEPEGAzPVY8HF238eueu3TXB0Xx4psV vEYQd3Zv7o64/DsrSveXF5v3ZCNOgY8LOy9ME6X5NTk5SifZhq1TYRup5M/xS5nq8vXU HegUIpW7NX5XvlTZytxqCj557LNeVP5mZEQZyjQr4vSfsHlZT3t57SCBOTx2OxA+c6oF 5ThQ== X-Received: by 10.15.44.4 with SMTP id y4mr11489789eev.71.1387109471751; Sun, 15 Dec 2013 04:11:11 -0800 (PST) Received: from localhost ([109.89.218.168]) by mx.google.com with ESMTPSA id e3sm29483198eeg.11.2013.12.15.04.11.10 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 15 Dec 2013 04:11:10 -0800 (PST) From: Christoph Paasch To: netdev@vger.kernel.org Cc: David Miller , Eric Dumazet , Julian Anastasov Subject: [PATCH 4/4] tcp: metrics: Dump info of the source-address in netlink-reply Date: Sun, 15 Dec 2013 13:10:44 +0100 Message-Id: <1387109444-1104-5-git-send-email-christoph.paasch@uclouvain.be> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1387109444-1104-1-git-send-email-christoph.paasch@uclouvain.be> References: <1387109444-1104-1-git-send-email-christoph.paasch@uclouvain.be> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Christoph Paasch --- include/uapi/linux/tcp_metrics.h | 2 ++ net/ipv4/tcp_metrics.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/include/uapi/linux/tcp_metrics.h b/include/uapi/linux/tcp_metrics.h index cb5157b55f32..54a37b13f2c4 100644 --- a/include/uapi/linux/tcp_metrics.h +++ b/include/uapi/linux/tcp_metrics.h @@ -35,6 +35,8 @@ enum { TCP_METRICS_ATTR_FOPEN_SYN_DROPS, /* u16, count of drops */ TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS, /* msecs age */ TCP_METRICS_ATTR_FOPEN_COOKIE, /* binary */ + TCP_METRICS_ATTR_SADDR_IPV4, /* u32 */ + TCP_METRICS_ATTR_SADDR_IPV6, /* binary */ __TCP_METRICS_ATTR_MAX, }; diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 8d544bb475dc..e150f264c8e2 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -745,11 +745,17 @@ static int tcp_metrics_fill_info(struct sk_buff *msg, if (nla_put_be32(msg, TCP_METRICS_ATTR_ADDR_IPV4, tm->tcpm_daddr.addr.a4) < 0) goto nla_put_failure; + if (nla_put_be32(msg, TCP_METRICS_ATTR_SADDR_IPV4, + tm->tcpm_saddr.addr.a4) < 0) + goto nla_put_failure; break; case AF_INET6: if (nla_put(msg, TCP_METRICS_ATTR_ADDR_IPV6, 16, tm->tcpm_daddr.addr.a6) < 0) goto nla_put_failure; + if (nla_put(msg, TCP_METRICS_ATTR_SADDR_IPV6, 16, + tm->tcpm_saddr.addr.a6) < 0) + goto nla_put_failure; break; default: return -EAFNOSUPPORT;