From 8216a4e721c799a1ed6916a7c71395a8daaa659b Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sat, 2 May 2009 09:46:54 -0700
Subject: [PATCH] Simplify tcfilter generation -- take 2

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/IPAddrs.pm |  5 +----
 Shorewall/Perl/Shorewall/Tc.pm      | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/IPAddrs.pm b/Shorewall/Perl/Shorewall/IPAddrs.pm
index c01d9d868..8eaff5678 100644
--- a/Shorewall/Perl/Shorewall/IPAddrs.pm
+++ b/Shorewall/Perl/Shorewall/IPAddrs.pm
@@ -263,11 +263,8 @@ sub ip_range_explicit( $ ) {
 sub decompose_net( $ ) {
     my $net = $_[0];
 
-    return ( qw/0x00000000 0x00000000/ ) if $net eq '-';
-
     ( $net, my $vlsm ) = validate_net( $net , 0 );
-
-    ( in_hex8( $net ) , vlsm_to_mask( $vlsm ) );
+    ( encodeaddr( $net) , $vlsm );
 
 }
 
diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index 02884086d..18876655d 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -706,19 +706,25 @@ sub process_tc_filter( $$$$$$ ) {
 
     fatal_error "No Classes were defined for INTERFACE $device" unless $tcref;
 
-    $tcref = $tcref->{$class};
+    my $classnum = hex_value $class;
+
+    fatal_error "Invalid CLASS ($class)" unless defined $classnum;
+
+    $tcref = $tcref->{$classnum};
 
     fatal_error "Unknown CLASS ($devclass)" unless $tcref; 
 
     my $rule = "filter add dev $device protocol ip parent $devnum:0 prio 10 u32";
 
-    my ( $net , $mask ) = decompose_net( $source );
+    if ( $source ne '-' ) {
+	my ( $net , $mask ) = decompose_net( $source );
+	$rule .= "\\\n   match ip src $net/$mask";
+    }
 
-    $rule .= "\\\n   match u32 $net $mask at 12" unless $mask eq '0x00000000';
-
-    ( $net , $mask ) = decompose_net( $dest );
-
-    $rule .= "\\\n   match u32 $net $mask at 16" unless $mask eq '0x00000000';
+    if ( $dest ne '-' ) {
+	my ( $net , $mask ) = decompose_net( $dest );
+	$rule .= "\\\n   match ip dst $net/$mask";
+    }
 
     my $protonumber = 0;
 
@@ -726,10 +732,7 @@ sub process_tc_filter( $$$$$$ ) {
 	$protonumber = resolve_proto $proto;
 	fatal_error "Unknown PROTO ($proto)" unless defined $protonumber;
 
-	if ( $protonumber ) {
-	    my $pnumber = in_hex2 $protonumber;
-	    $rule .= "\\\n   match u8 $pnumber 0xff at 9";
-	}
+	$rule .= "\\\n   match ip protocol $protonumber 0xff" if $protonumber;
     }
 
     if ( $portlist eq '-' && $sportlist eq '-' ) {