From 1724ae250437405eb92f67ff8642daf91acd05bb Mon Sep 17 00:00:00 2001 From: Babak Farrokhi Date: Wed, 28 Oct 2015 14:42:10 +0330 Subject: [PATCH] - Fix matching table names that include "-" charachter - Fix drawing graph for inout graphs --- plugins/network/pf_tables_ | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/network/pf_tables_ b/plugins/network/pf_tables_ index 3e98903f..0f3975ae 100644 --- a/plugins/network/pf_tables_ +++ b/plugins/network/pf_tables_ @@ -113,19 +113,18 @@ if ( defined($ARGV[0])) { print "in.label in\n"; print "in.type DERIVE\n"; - print "in.draw AREASTACK\n"; + print "in.draw AREA\n"; print "in.colour C00000\n"; print "in.cdef in,8,*\n"; print "in.min 0\n"; print "in.graph no\n"; - print "out.label out\n"; + print "out.label bps\n"; print "out.type DERIVE\n"; print "out.negative in\n"; - print "out.draw AREASTACK\n"; - print "out.colour 0000C0\n"; + print "out.draw AREA\n"; + print "out.colour COLOUR18\n"; print "out.cdef out,8,*\n"; print "out.min 0\n"; - print "out.graph no\n"; foreach my $field (qw(in out)) { print_thresholds($field); @@ -191,9 +190,10 @@ sub tables { foreach (split(/\n/, $output)) { - if (m|^[cpairhC\-]{7}\s+(\w+)$|) { + if (m|^[cpairhC\-]{7}\s+(\S+)$|) { $name = $1; - $tables{$name}->{"name"} = $1; + $name =~ s/\-/_/; + $tables{$name}->{"name"} = $name; next; }