diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 725ee0e64..a5c5e124f 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -60,11 +60,13 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_object disable_object numeric_value numeric_value1 + hex_value in_hex in_hex2 in_hex3 in_hex4 in_hex8 + in_hexp emit emit_unindented save_progress_message @@ -752,6 +754,14 @@ sub numeric_value1 ( $ ) { use warnings; } +sub hex_value( $ ) { + my $val = lc $_[0]; + return undef unless $val =~ /^[a-f0-9]+$/; + no warnings; + oct '0x' . $val; + use warnings; +} + # # Return the argument expressed in Hex # @@ -775,6 +785,10 @@ sub in_hex8( $ ) { sprintf '0x%08x', $_[0]; } +sub in_hexp( $ ) { + sprintf '%x', $_[0]; +} + # # Write the arguments to the object file (if any) with the current indentation. # diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index 5efeab471..02884086d 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -444,7 +444,7 @@ sub validate_tc_device( $$$$$ ) { fatal_error "Invalid NUMBER:INTERFACE ($device:$number:$rest)" if defined $rest; if ( defined $number ) { - $devnumber = numeric_value( $number ); + $devnumber = hex_value( $number ); fatal_error "Invalid interface NUMBER ($number)" unless defined $devnumber && $devnumber; fatal_error "Duplicate interface number ($number)" if defined $devnums[ $devnumber ]; $devnum = $devnumber if $devnumber > $devnum; @@ -531,10 +531,10 @@ sub convert_rate( $$$ ) { sub dev_by_number( $ ) { my $dev = $_[0]; - my $devnum = numeric_value( $dev ); + my $devnum = uc $dev; my $devref; - if ( defined $devnum ) { + if ( $devnum =~ /^\d+$/ ) { $dev = $devnums[ $devnum ]; fatal_error "Undefined INTERFACE number ($_[0])" unless defined $dev; $devref = $tcdevices{$dev}; @@ -566,13 +566,14 @@ sub validate_tc_class( $$$$$$ ) { ( $device, my ($number, $rest ) ) = split /:/, $device, 3; fatal_error "Invalid INTERFACE:CLASS ($devclass)" if defined $rest; + ( $device , $classnumber ) = ( hex_value $device, hex_value $number ); + ( $device , $devref) = dev_by_number( $device ); if ( defined $number ) { if ( $devref->{classify} ) { - $classnumber = numeric_value( $number ); - fatal_error "Invalid interface NUMBER ($number)" unless defined $classnumber && $classnumber; - fatal_error "Duplicate interface/class number ($number)" if defined $devnums[ $classnumber ]; + fatal_error "Invalid interface/class number ($devclass)" unless defined $classnumber && $classnumber; + fatal_error "Duplicate interface/class number ($devclass)" if defined $devnums[ $classnumber ]; } else { warning_message "Class NUMBER ignored -- INTERFACE $device does not have the 'classify' option"; } @@ -599,7 +600,7 @@ sub validate_tc_class( $$$$$$ ) { $markval = numeric_value( $mark ); fatal_error "Invalid MARK ($markval)" unless defined $markval; - $classnumber = $config{WIDE_TC_MARKS} ? ( $devref->{number} << 10 ) | $markval : $devnum . $markval; + $classnumber = $config{WIDE_TC_MARKS} ? 0x4000 | $markval : $devnum . $markval; fatal_error "Duplicate MARK ($mark)" if $tcref->{$classnumber}; } } else { @@ -881,7 +882,7 @@ sub setup_traffic_shaping() { for my $device ( @tcdevices ) { my $dev = chain_base( $device ); my $devref = $tcdevices{$device}; - my $defmark = $devref->{default} || 0; + my $defmark = in_hexp ( $devref->{default} || 0 ); my $devnum = $devref->{number}; emit "if interface_is_up $device; then"; @@ -926,20 +927,21 @@ sub setup_traffic_shaping() { for my $class ( @tcclasses ) { my ( $device, $classnum ) = split /:/, $class; - my $devref = $tcdevices{$device}; - my $tcref = $tcclasses{$device}{$classnum}; - my $mark = $tcref->{mark}; + my $devref = $tcdevices{$device}; + my $tcref = $tcclasses{$device}{$classnum}; + my $mark = $tcref->{mark}; my $devicenumber = $devref->{number}; - my $classid = join( ':', $devicenumber, $classnum); - my $rate = "$tcref->{rate}kbit"; - my $quantum = calculate_quantum $rate, calculate_r2q( $devref->{out_bandwidth} ); - my $dev = chain_base $device; + my $classid = join( ':', in_hexp $devicenumber, in_hexp $classnum); + my $rate = "$tcref->{rate}kbit"; + my $quantum = calculate_quantum $rate, calculate_r2q( $devref->{out_bandwidth} ); + my $dev = chain_base $device; + my $priority = $tcref->{priority} << 8; $classids{$classid}=$device; - $classid = join( ':', in_hex $devicenumber, in_hex4 $classnum ); + $classnum = in_hexp $classnum; - $classid =~ s/0x//g; + $classid = join( ':', in_hexp $devicenumber, $classnum ); if ( $lastdevice ne $device ) { if ( $lastdevice ) { @@ -959,16 +961,16 @@ sub setup_traffic_shaping() { # # add filters # - emit "run_tc filter add dev $device protocol ip parent $devicenumber:0 prio 1 handle $mark fw classid $classid" unless $devref->{classify}; + emit "run_tc filter add dev $device protocol ip parent $devicenumber:0 prio " . ( $priority | 20 ) . " handle $mark fw classid $classid" unless $devref->{classify}; emit "run_tc filter add dev $device protocol ip prio 1 parent $classnum: protocol ip handle $classnum flow hash keys $tcref->{flow} divisor 1024" if $tcref->{flow}; # #options # - emit "run_tc filter add dev $device parent $devref->{number}:0 protocol ip prio 10 u32 match ip protocol 6 0xff match u8 0x05 0x0f at 0 match u16 0x0000 0xffc0 at 2 match u8 0x10 0xff at 33 flowid $classid" if $tcref->{tcp_ack}; + emit "run_tc filter add dev $device parent $devref->{number}:0 protocol ip prio " . ( $priority | 10 ) ." u32 match ip protocol 6 0xff match u8 0x05 0x0f at 0 match u16 0x0000 0xffc0 at 2 match u8 0x10 0xff at 33 flowid $classid" if $tcref->{tcp_ack}; for my $tospair ( @{$tcref->{tos}} ) { my ( $tos, $mask ) = split q(/), $tospair; - emit "run_tc filter add dev $device parent $devicenumber:0 protocol ip prio 10 u32 match ip tos $tos $mask flowid $classid"; + emit "run_tc filter add dev $device parent $devicenumber:0 protocol ip prio " . ( $priority | 10 ) . " u32 match ip tos $tos $mask flowid $classid"; } save_progress_message_short qq(" TC Class $class defined."); diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 3904b0e65..78cebee1a 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -6,6 +6,8 @@ Changes in Shorewall 4.3.10 3) Allow compile to STDOUT. +4) Fix handling of class IDs. + Changes in Shorewall 4.3.9 1) Logging rules now create separate chain. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index aa00e4ec1..93a00685b 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -66,6 +66,14 @@ released late in 2009. iptables-restore v1.3.5: Bad mac address `-j' +2. Previously, Shorewall has treated traffic shaping class IDs as + decimal numbers (or pairs of decimal numbers). That worked fine + until IPMARK was implemented. IPMARK requires Shorewall to generate + class Ids in numeric sequence. In 4.3.9, that didn't work correctly + because Shorewall was generating the sequence "..8,9,10,11..." when + the correct sequence was "...8,9,a,b,...". Shorewall now treats + class IDs as hex, like 'tc' and 'iptables' do. + ---------------------------------------------------------------------------- K N O W N P R O B L E M S R E M A I N I N G ---------------------------------------------------------------------------- diff --git a/Shorewall/shorewall b/Shorewall/shorewall index b1de7de28..b4c0e90dc 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1996,11 +1996,11 @@ case "$COMMAND" in ;; decode) [ $# -eq 2 ] || usage 1 - echo "Mark = $(($2 & 0x3fff))" + echo "Mark = $((0x$2 & 0x3fff))" ;; encode) [ $# -eq 2 ] || usage 1 - echo "Class Number = $((0x4000 | $2))" + echo "Class Number = 4$(printf '0%x', $2)" ;; call) get_config