From 605ef6ef862eebd9bd0b71c5419caa653d1fbaee Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 9 May 2012 13:10:51 -0700 Subject: [PATCH] Tweak to DIVERT plus correct TPROXY in man pages. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Tc.pm | 2 ++ Shorewall/manpages/shorewall-tcrules.xml | 2 +- Shorewall6/manpages/shorewall6-tcrules.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index 6b655219c..49c3fe9f5 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -358,6 +358,8 @@ sub process_tc_rule( ) { } $target .= ' --tproxy-mark'; + + $mark = "$mark/" . in_hex( $globals{PROVIDER_MASK} ); }, TTL => sub() { fatal_error "TTL is not supported in IPv6 - use HL instead" if $family == F_IPV6; diff --git a/Shorewall/manpages/shorewall-tcrules.xml b/Shorewall/manpages/shorewall-tcrules.xml index e0293b90a..770a44d0c 100644 --- a/Shorewall/manpages/shorewall-tcrules.xml +++ b/Shorewall/manpages/shorewall-tcrules.xml @@ -422,7 +422,7 @@ SAME $FW 0.0.0.0/0 tcp 80,443 TPROXY(mark[/mask][,[port][,[address]]]) + role="bold">TPROXY(mark[,[port][,[address]]]) Transparently redirects a packet without altering the IP header. Requires a local provider to be defined in TPROXY(mark[/mask][,[port][,[address]]]) + role="bold">TPROXY(mark][,[port][,[address]]]) Transparently redirects a packet without altering the IP header. Requires a local provider to be defined in