diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-05-18 14:36:08 +0000 |
|---|---|---|
| committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-05-18 14:36:08 +0000 |
| commit | cd7190eda077060445f516f1b2fd83c4cb45b81d (patch) | |
| tree | 7787eb966dd0a5a0fd679b2564578c0847f43a7f | |
| parent | 33bffc11fe97b60932da25a8a5b428316fdc86eb (diff) | |
| download | vyatta-op-firewall-cd7190eda077060445f516f1b2fd83c4cb45b81d.tar.gz vyatta-op-firewall-cd7190eda077060445f516f1b2fd83c4cb45b81d.zip | |
firewall: T2194: Fix firewall op-mode garbled output
Different output from "iptables -L" in 1.3 compared to 1.2
This way parser can't process output correctly at least "comment"
| -rwxr-xr-x | scripts/firewall/vyatta-show-firewall.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/firewall/vyatta-show-firewall.pl b/scripts/firewall/vyatta-show-firewall.pl index 3f16894..a4b3ce7 100755 --- a/scripts/firewall/vyatta-show-firewall.pl +++ b/scripts/firewall/vyatta-show-firewall.pl @@ -329,6 +329,8 @@ sub print_detail_rule { # trim leading and trailing whitespaces $string =~ s/^\s+|\s+$//g; + # Hide comments like /* foo-20 */ T2194 + $string =~ s/\/\* $chain-$rule \*\///; @string_words = split (/\s+/, $string, 13); @string_words_part1=splice(@string_words, 0, 4); # packets, bytes, target, proto @@ -359,7 +361,7 @@ sub print_detail_rule { if ($iptables_cmd =~ /6/) { @string_words_part3=splice(@string_words, 5);# all other matches after comment } else { - @string_words_part3=splice(@string_words, 6);# all other matches after comment + @string_words_part3=splice(@string_words, 3);# all other matches after comment } } my $condition='condition - '; |