extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-20 21:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add TPROXY_MARK to the output of 'shorewall show marks'

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-06-23 07:57:39 -07:00
parent b9d59bc60c
commit 9aa78656ec
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall/Perl/Shorewall/Config.pm
View File

@ -4185,10 +4185,10 @@ sub get_configuration( $$$ ) {
} }
if ( ( my $userbits = $config{PROVIDER_OFFSET} - $config{TC_BITS} ) > 0 ) { if ( ( my $userbits = $config{PROVIDER_OFFSET} - $config{TC_BITS} ) > 0 ) {
$globals{USER_MASK} = make_mask( $userbits ) << $config{TC_BITS}; $globals{USER_MASK} = make_mask( $userbits ) << $config{TC_BITS};
$globals{USER_BITS} = $userbits;
} else { } else {
$globals{USER_MASK} = 0; $globals{USER_MASK} = $globals{USER_BITS} = 0;
} }
if ( supplied ( $val = $config{ZONE2ZONE} ) ) { if ( supplied ( $val = $config{ZONE2ZONE} ) ) {
@ -4606,7 +4606,7 @@ sub dump_mark_layout() {
$globals{TC_MASK} ); $globals{TC_MASK} );
dumpout( "User", dumpout( "User",
$globals{USER_MASK}, $globals{USER_BITS},
$globals{TC_MAX} + 1, $globals{TC_MAX} + 1,
$globals{USER_MASK}, $globals{USER_MASK},
$globals{USER_MASK} ); $globals{USER_MASK} );
@ -4628,6 +4628,12 @@ sub dump_mark_layout() {
$globals{EXCLUSION_MASK}, $globals{EXCLUSION_MASK},
$globals{EXCLUSION_MASK}, $globals{EXCLUSION_MASK},
$globals{EXCLUSION_MASK} ); $globals{EXCLUSION_MASK} );
dumpout( "TProxy",
1,
$globals{TPROXY_MARK},
$globals{TPROXY_MARK},
$globals{TPROXY_MARK} );
} }
END { END {