From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vadim Kochan Subject: Re: [PATCH iproute2 2/2] tc class: Ignore if default class name file does not exist Date: Tue, 17 Mar 2015 20:21:37 +0200 Message-ID: <20150317182137.GA1056@angus-think.lan> References: <1426611124-2295-1-git-send-email-vadim4j@gmail.com> <1426611124-2295-3-git-send-email-vadim4j@gmail.com> <5508658E.9050909@iogearbox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Vadim Kochan , netdev@vger.kernel.org To: Daniel Borkmann Return-path: Received: from mail-lb0-f171.google.com ([209.85.217.171]:35224 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752679AbbCQSdW (ORCPT ); Tue, 17 Mar 2015 14:33:22 -0400 Received: by lbcgn8 with SMTP id gn8so13600100lbc.2 for ; Tue, 17 Mar 2015 11:33:20 -0700 (PDT) Content-Disposition: inline In-Reply-To: <5508658E.9050909@iogearbox.net> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, Mar 17, 2015 at 06:34:06PM +0100, Daniel Borkmann wrote: > On 03/17/2015 05:52 PM, Vadim Kochan wrote: > ... > >Changed default class name file cls_names -> tc_cls. > > Why that? > tc_cls seems better and shorter. > >Signed-off-by: Vadim Kochan > >--- > > tc/tc_util.c | 19 +++++++++++++++---- > > 1 file changed, 15 insertions(+), 4 deletions(-) > > > >diff --git a/tc/tc_util.c b/tc/tc_util.c > >index feae439..5213e9e 100644 > >--- a/tc/tc_util.c > >+++ b/tc/tc_util.c > ... > > static struct db_names *cls_names = NULL; > > > >-#define NAMES_DB "/etc/iproute2/cls_names" > >+#define NAMES_DB "/etc/iproute2/tc_cls" > > > > int cls_names_init(char *path) > > { > >- cls_names = db_names_alloc(path ?: NAMES_DB); > >- if (!cls_names) { > >- fprintf(stderr, "Error while opening class names file\n"); > >+ int ret = -1; > >+ > >+ cls_names = db_names_alloc(); > >+ if (!cls_names) > >+ return -1; > >+ > >+ ret = db_names_load(cls_names, path ?: NAMES_DB); > >+ if (ret == -ENOENT && path) { > >+ fprintf(stderr, "Can't open class names file: %s\n", path); > > That would mean that existing users having a /etc/iproute2/cls_names > file would suddenly not see class names anymore? Hm, but that was added few days ago.