Patchwork iproute2 - Fix tc stats when using -batch mode

login
register
mail settings
Submitter Nigel Kukard
Date Oct. 14, 2013, 10:16 p.m.
Message ID <sig.1999aa60cf.525C6D44.9040207@lbsd.net>
Download mbox | patch
Permalink /patch/283420/
State Superseded
Delegated to: stephen hemminger
Headers show

Comments

Nigel Kukard - Oct. 14, 2013, 10:16 p.m.
Hi,

There are two global variables in tc/tc_class.c:
__u32 filter_qdisc;
__u32 filter_classid;

These are not re-initialized for each line received in -batch mode:
# tc -force -batch -
class show dev eth0 parent 1: classid 1:1
class show dev eth0 parent 1: classid 1:1
Error: duplicate "classid": "1:1" is the second value.

This patch fixes the issue by initializing the two globals when we
enter print_class().


Attached a patch which fixes this by initializing them when 
print_class() is called.


-N

Patch

commit d04acab5a8c0267610e9ea21f8a42e54ed4585dc
Author: Nigel Kukard <nkukard@lbsd.net>
Date:   Mon Oct 14 22:10:16 2013 +0000

    Fix tc stats when using -batch mode
    
    There are two global variables in tc/tc_class.c:
    __u32 filter_qdisc;
    __u32 filter_classid;
    
    These are not re-initialized for each line received in -batch mode:
    class show dev eth0 parent 1: classid 1:1
    class show dev eth0 parent 1: classid 1:1
    Error: duplicate "classid": "1:1" is the second value.
    
    This patch fixes the issue by initializing the two globals when we
    enter print_class().

diff --git a/tc/tc_class.c b/tc/tc_class.c
index 9d4eea5..8043448 100644
--- a/tc/tc_class.c
+++ b/tc/tc_class.c
@@ -241,6 +241,9 @@  int tc_class_list(int argc, char **argv)
 	t.tcm_family = AF_UNSPEC;
 	memset(d, 0, sizeof(d));
 
+	filter_qdisc = 0;
+	filter_classid = 0;
+
 	while (argc > 0) {
 		if (strcmp(*argv, "dev") == 0) {
 			NEXT_ARG();