holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Merge branch '4.4.27' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.4.27

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-12-26 13:22:30 -08:00
commit 1c2ab238a5
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/IPAddrs.pm
View File

@ -55,6 +55,7 @@ our @EXPORT = qw( ALLIPv4
DCCP DCCP
IPv6_ICMP IPv6_ICMP
SCTP SCTP
GRE
validate_address validate_address
validate_net validate_net
@ -117,6 +118,7 @@ use constant { ALLIPv4 => '0.0.0.0/0' ,
TCP => 6, TCP => 6,
UDP => 17, UDP => 17,
DCCP => 33, DCCP => 33,
GRE => 47,
IPv6_ICMP => 58, IPv6_ICMP => 58,
SCTP => 132, SCTP => 132,
UDPLITE => 136 }; UDPLITE => 136 };

3
Shorewall/Perl/Shorewall/Raw.pm
View File

@ -59,6 +59,7 @@ sub process_notrack_rule( $$$$$$$ ) {
my $target = $action; my $target = $action;
my $exception_rule = ''; my $exception_rule = '';
my $rule = do_proto( $proto, $ports, $sports ) . do_user ( $user );
unless ( $action eq 'NOTRACK' ) { unless ( $action eq 'NOTRACK' ) {
( $target, my ( $option, $args, $junk ) ) = split ':', $action, 4; ( $target, my ( $option, $args, $junk ) ) = split ':', $action, 4;
@ -96,7 +97,7 @@ sub process_notrack_rule( $$$$$$$ ) {
expand_rule( $chainref , expand_rule( $chainref ,
$restriction , $restriction ,
do_proto( $proto, $ports, $sports ) . do_user ( $user ) , $rule,
$source , $source ,
$dest , $dest ,
'' , '' ,

12
Shorewall/Perl/Shorewall/Tc.pm
View File

@ -488,7 +488,7 @@ sub process_tc_rule( ) {
do_length( $length ) . do_length( $length ) .
do_tos( $tos ) . do_tos( $tos ) .
do_connbytes( $connbytes ) . do_connbytes( $connbytes ) .
do_helper( $helper ) . do_helper( $helper, $proto ) .
do_headers( $headers ) , do_headers( $headers ) ,
$source , $source ,
$dest , $dest ,
@ -1451,7 +1451,15 @@ sub process_tc_priority() {
fatal_error "Invalid PRIORITY ($band)" unless $val && $val <= 3; fatal_error "Invalid PRIORITY ($band)" unless $val && $val <= 3;
my $rule = do_helper( $helper ) . "-j MARK --set-mark $band"; my $rule;
unless ( $helper eq '-' ) {
fatal_error( "A PROTO is required when a HELPER is specified" ) if $proto eq '-';
fatal_error( "Unknown protocol" ) unless defined resolve_protocol( $proto );
$rule = do_helper( $helper, $proto ) . "-j MARK --set-mark $band";
} else {
$rule = '';
}
$rule .= join('', '/', in_hex( $globals{TC_MASK} ) ) if have_capability( 'EXMARK' ); $rule .= join('', '/', in_hex( $globals{TC_MASK} ) ) if have_capability( 'EXMARK' );