extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-24 00:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

More tcfilters pretty-up

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8304 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-03-17 23:54:41 +00:00
parent 3bc1c7f188
commit 2daa5705d9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall-perl/Shorewall/Config.pm
View File

@ -56,6 +56,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_object
finalize_object finalize_object
numeric_value numeric_value
in_hex in_hex
in_hex2
in_hex4 in_hex4
in_hex8 in_hex8
emit emit
@ -531,6 +532,10 @@ sub in_hex( $ ) {
sprintf '0x%x', $_[0]; sprintf '0x%x', $_[0];
} }
sub in_hex2( $ ) {
sprintf '0x%02x', $_[0];
}
sub in_hex4( $ ) { sub in_hex4( $ ) {
sprintf '0x%04x', $_[0]; sprintf '0x%04x', $_[0];
} }

7
Shorewall-perl/Shorewall/Tc.pm
View File

@ -545,7 +545,9 @@ sub process_tc_filter( $$$$$$ ) {
$protonumber = resolve_proto $proto; $protonumber = resolve_proto $proto;
fatal_error "Unknown PROTO ($proto)" unless defined $protonumber; fatal_error "Unknown PROTO ($proto)" unless defined $protonumber;
$rule .= "\\\n match u8 $protonumber 0xFF at 9"; my $pnumber = in_hex2 $protonumber;
$rule .= "\\\n match u8 $pnumber 0xFF at 9";
} }
unless ( $port eq '-' ) { unless ( $port eq '-' ) {
@ -555,6 +557,9 @@ sub process_tc_filter( $$$$$$ ) {
if ( $protonumber == ICMP ) { if ( $protonumber == ICMP ) {
my ( $icmptype , $icmpcode ) = split '//', validate_icmp( $port ); my ( $icmptype , $icmpcode ) = split '//', validate_icmp( $port );
$icmptype = in_hex2 numeric_value $icmptype;
$icmpcode = in_hex2 numeric_value $icmpcode if defined $icmpcode;
if ( $config{BROKEN_NEXTHDR} ) { if ( $config{BROKEN_NEXTHDR} ) {
$rule .= "\\\n match u8 $icmptype 0xFF at 20"; $rule .= "\\\n match u8 $icmptype 0xFF at 20";
$rule .= "\\\n match u8 $icmpcode 0xFF at 21" if defined $icmpcode; $rule .= "\\\n match u8 $icmpcode 0xFF at 21" if defined $icmpcode;