From patchwork Tue Mar 27 23:51:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 891866 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 409nqg5gcLz9s0b for ; Wed, 28 Mar 2018 10:52:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752397AbeC0XwN (ORCPT ); Tue, 27 Mar 2018 19:52:13 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:46664 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbeC0XwN (ORCPT ); Tue, 27 Mar 2018 19:52:13 -0400 Received: from localhost ([::1]:33708 helo=xsao) by orbyte.nwl.cc with esmtp (Exim 4.90_1) (envelope-from ) id 1f0yNv-0006Bu-T1; Wed, 28 Mar 2018 01:52:11 +0200 From: Phil Sutter To: Stephen Hemminger Cc: netdev@vger.kernel.org Subject: [iproute PATCH v2 3/3] ss: Drop filter_default_dbs() Date: Wed, 28 Mar 2018 01:51:56 +0200 Message-Id: <20180327235156.16680-4-phil@nwl.cc> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180327235156.16680-1-phil@nwl.cc> References: <20180327235156.16680-1-phil@nwl.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Instead call filter_db_parse(..., "all"). This eliminates the duplicate default DB definition. Signed-off-by: Phil Sutter --- misc/ss.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 83e476a0407e5..fc8e2a0d719fd 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -408,23 +408,6 @@ static int filter_af_get(struct filter *f, int af) return !!(f->families & FAMILY_MASK(af)); } -static void filter_default_dbs(struct filter *f, bool enable) -{ - filter_db_set(f, UDP_DB, enable); - filter_db_set(f, DCCP_DB, enable); - filter_db_set(f, TCP_DB, enable); - filter_db_set(f, RAW_DB, enable); - filter_db_set(f, UNIX_ST_DB, enable); - filter_db_set(f, UNIX_DG_DB, enable); - filter_db_set(f, UNIX_SQ_DB, enable); - filter_db_set(f, PACKET_R_DB, enable); - filter_db_set(f, PACKET_DG_DB, enable); - filter_db_set(f, NETLINK_DB, enable); - filter_db_set(f, SCTP_DB, enable); - filter_db_set(f, VSOCK_ST_DB, enable); - filter_db_set(f, VSOCK_DG_DB, enable); -} - static void filter_states_set(struct filter *f, int states) { if (states) @@ -4934,7 +4917,7 @@ int main(int argc, char *argv[]) if (do_default) { state_filter = state_filter ? state_filter : SS_CONN; - filter_default_dbs(¤t_filter, true); + filter_db_parse(¤t_filter, "all"); } filter_states_set(¤t_filter, state_filter);