On 5/29/11 2:37 PM, Steven Jan Springl wrote: >> I can confirm the patch works. I can also confirm the UID patch works. >> Thanks. >
Thanks. > > When tcrules file contains: > > IPMARK(dst,0X880,0xcc00,124) $FW eth1 > > the following messages are produced: > > Argument "0X880" isn't numeric in bitwise and (&) > at /usr/share/shorewall/Shorewall/Tc.pm line 334, <$currentfile> line 15. > > Argument "0xcc00" isn't numeric in bitwise and (&) > at /usr/share/shorewall/Shorewall/Tc.pm line 340, <$currentfile> line 15. For such a simple fix, I seem to be having an unusually hard time with it :-( This should eliminate the problem you're seeing -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index 955fd7b..bd441fe 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -331,13 +331,13 @@ sub process_tc_rule( ) {
if ( defined $m1 && $m1 ne '' ) {
$val = numeric_value ($m1);
fatal_error "Invalid Mask ($m1)" unless defined
$val && $val && $val <= 0xffffffff;
- $mask1 = in_hex ( $m1 & 0xffffffff );
+ $mask1 = in_hex ( $val & 0xffffffff );
}
if ( defined $m2 && $m2 ne '' ) {
$val = numeric_value ($m2);
fatal_error "Invalid Mask ($m2)" unless defined
$val && $val <= 0xffffffff;
- $mask2 = in_hex ( $m2 & 0xffffffff );
+ $mask2 = in_hex ( $val & 0xffffffff );
}
if ( defined $s ) {
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ vRanger cuts backup time in half-while increasing security. With the market-leading solution for virtual backup and recovery, you get blazing-fast, flexible, and affordable data protection. Download your free trial now. http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
