From patchwork Sat Oct 18 23:50:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 400721 X-Patchwork-Delegate: shemminger@vyatta.com 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 1E9AA14007D for ; Sun, 19 Oct 2014 10:59:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751671AbaJRX7Y (ORCPT ); Sat, 18 Oct 2014 19:59:24 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:38079 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751593AbaJRX7X (ORCPT ); Sat, 18 Oct 2014 19:59:23 -0400 Received: by mail-lb0-f181.google.com with SMTP id l4so2227695lbv.40 for ; Sat, 18 Oct 2014 16:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PeA+1qyyQVurdfiEli8ZIGjnhEnDtnutzGr8b1OC2Gg=; b=MyRYLzUQvyWRjHEVMWq+o4MAvbG1MKZyU8+jJuq6zWTENqfwzGZCvnS85b18+9WRIm TdIIxeEeaoU3iIyMh9vf15ihfbreEWWL9LUs6ZURSa97ZynigvHjEnHYqoXxvX0pgygD 02AnQms/0HD/sQfIjtljy/hjmI0Sh1LGaylCPAY2hvGD/mGgGNSDYqW109Oi+/5n0EQx /CcNNp8VX7cArAO264gt7N4fNgeQDXUuFdUZwd0mzDk6waMxluo7/E0xj+QFe/kEdGFG w0OQvXzlNEYrqKdvs5k2iqULxz7eYNO2OBzlsGvTTs3//qzVbyXqaHpvZLchngvzju6o uTGg== X-Received: by 10.152.88.105 with SMTP id bf9mr17920966lab.30.1413676762159; Sat, 18 Oct 2014 16:59:22 -0700 (PDT) Received: from localhost.localdomain (77-123-172-44-ptr.volia-lviv.com. [77.123.172.44]) by mx.google.com with ESMTPSA id l1sm1718478lag.42.2014.10.18.16.59.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Oct 2014 16:59:21 -0700 (PDT) From: Vadim Kochan To: netdev@vger.kernel.org Cc: Vadim Kochan Subject: [PATCH iproute2] ss: Refactor to use macro for define diag nl request Date: Sun, 19 Oct 2014 02:50:29 +0300 Message-Id: <1413676229-23258-1-git-send-email-vadim4j@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Vadim Kochan --- misc/ss.c | 57 ++++++++++++++++++--------------------------------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 2420b51..261847b 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -41,6 +41,20 @@ #include #include +#define DIAG_REQUEST(_req, _r) \ + struct { \ + struct nlmsghdr nlh; \ + _r; \ + } _req = { \ + .nlh = { \ + .nlmsg_type = SOCK_DIAG_BY_FAMILY, \ + .nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST,\ + .nlmsg_seq = 123456, \ + .nlmsg_len = sizeof(_req), \ + .nlmsg_pid = 0, \ + }, \ + } + #if HAVE_SELINUX #include #else @@ -1795,10 +1809,7 @@ static int tcpdiag_send(int fd, int protocol, struct filter *f) static int sockdiag_send(int family, int fd, int protocol, struct filter *f) { struct sockaddr_nl nladdr; - struct { - struct nlmsghdr nlh; - struct inet_diag_req_v2 r; - } req; + DIAG_REQUEST(req, struct inet_diag_req_v2 r); char *bc = NULL; int bclen; struct msghdr msg; @@ -1811,11 +1822,6 @@ static int sockdiag_send(int family, int fd, int protocol, struct filter *f) memset(&nladdr, 0, sizeof(nladdr)); nladdr.nl_family = AF_NETLINK; - req.nlh.nlmsg_len = sizeof(req); - req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY; - req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; - req.nlh.nlmsg_pid = 0; - req.nlh.nlmsg_seq = 123456; memset(&req.r, 0, sizeof(req.r)); req.r.sdiag_family = family; req.r.sdiag_protocol = protocol; @@ -2577,16 +2583,7 @@ close_it: static int unix_show_netlink(struct filter *f, FILE *dump_fp) { - struct { - struct nlmsghdr nlh; - struct unix_diag_req r; - } req; - - memset(&req, 0, sizeof(req)); - req.nlh.nlmsg_len = sizeof(req); - req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY; - req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; - req.nlh.nlmsg_seq = 123456; + DIAG_REQUEST(req, struct unix_diag_req r); req.r.sdiag_family = AF_UNIX; req.r.udiag_states = f->states; @@ -2778,21 +2775,12 @@ static int packet_show_sock(struct nlmsghdr *nlh, struct filter *f) static int packet_show_netlink(struct filter *f, FILE *dump_fp) { int fd; - struct { - struct nlmsghdr nlh; - struct packet_diag_req r; - } req; + DIAG_REQUEST(req, struct packet_diag_req r); char buf[8192]; if ((fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG)) < 0) return -1; - memset(&req, 0, sizeof(req)); - req.nlh.nlmsg_len = sizeof(req); - req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY; - req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; - req.nlh.nlmsg_seq = 123456; - req.r.sdiag_family = AF_PACKET; req.r.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MEMINFO | PACKET_SHOW_FILTER; @@ -3091,16 +3079,7 @@ static int netlink_show_sock(struct nlmsghdr *nlh, struct filter *f) static int netlink_show_netlink(struct filter *f, FILE *dump_fp) { - struct { - struct nlmsghdr nlh; - struct netlink_diag_req r; - } req; - - memset(&req, 0, sizeof(req)); - req.nlh.nlmsg_len = sizeof(req); - req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY; - req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; - req.nlh.nlmsg_seq = 123456; + DIAG_REQUEST(req, struct netlink_diag_req r); req.r.sdiag_family = AF_NETLINK; req.r.sdiag_protocol = NDIAG_PROTO_ALL;