From 9aa78656ec6405f946c3e80115a0bfafb840bc34 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 23 Jun 2012 07:57:39 -0700 Subject: [PATCH] Add TPROXY_MARK to the output of 'shorewall show marks' Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 58b0ce8fa..438c049f2 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -4185,10 +4185,10 @@ sub get_configuration( $$$ ) { } if ( ( my $userbits = $config{PROVIDER_OFFSET} - $config{TC_BITS} ) > 0 ) { - $globals{USER_MASK} = make_mask( $userbits ) << $config{TC_BITS}; + $globals{USER_BITS} = $userbits; } else { - $globals{USER_MASK} = 0; + $globals{USER_MASK} = $globals{USER_BITS} = 0; } if ( supplied ( $val = $config{ZONE2ZONE} ) ) { @@ -4606,7 +4606,7 @@ sub dump_mark_layout() { $globals{TC_MASK} ); dumpout( "User", - $globals{USER_MASK}, + $globals{USER_BITS}, $globals{TC_MAX} + 1, $globals{USER_MASK}, $globals{USER_MASK} ); @@ -4628,6 +4628,12 @@ sub dump_mark_layout() { $globals{EXCLUSION_MASK}, $globals{EXCLUSION_MASK}, $globals{EXCLUSION_MASK} ); + + dumpout( "TProxy", + 1, + $globals{TPROXY_MARK}, + $globals{TPROXY_MARK}, + $globals{TPROXY_MARK} ); } END {