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

Merge branch '4.5.4'

Browse Source
This commit is contained in:
Tom Eastep 2012-06-07 14:12:48 -07:00
commit 8a9427ebff
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -707,7 +707,9 @@ sub macro_comment( $ ) {
# Functions to manipulate cmdlevel
#
sub incr_cmd_level( $ ) {
$_[0]->{cmdlevel}++;
my $chain = $_[0];
$chain->{cmdlevel}++;
$chain->{optflags} |= ( DONT_OPTIMIZE | DONT_MOVE );
}
sub decr_cmd_level( $ ) {
@ -1021,6 +1023,7 @@ sub add_commands ( $$;@ ) {
} for @_;
$chainref->{referenced} = 1;
$chainref->{optflags} |= ( DONT_OPTIMIZE | DONT_MOVE );
}
#

2
Shorewall/Samples/one-interface/interfaces
View File

@ -14,4 +14,4 @@
FORMAT 2
###############################################################################
#ZONE INTERFACE OPTIONS
net eth0 dhcp,tcpflags,logmartians,nosmurfs
net eth0 dhcp,tcpflags,logmartians,nosmurfs,sourceroute=0

2
Shorewall/Samples/three-interfaces/interfaces
View File

@ -14,6 +14,6 @@
FORMAT 2
###############################################################################
#ZONE INTERFACE OPTIONS
net eth0 tcpflags,dhcp,nosmurfs,routefilter,logmartians
net eth0 tcpflags,dhcp,nosmurfs,routefilter,logmartians,sourceroute=0
loc eth1 tcpflags,nosmurfs,routefilter,logmartians
dmz eth2 tcpflags,nosmurfs,routefilter,logmartians

2
Shorewall/Samples/two-interfaces/interfaces
View File

@ -14,5 +14,5 @@
FORMAT 2
###############################################################################
#ZONE INTERFACE OPTIONS
net eth0 dhcp,tcpflags,nosmurfs,routefilter,logmartians
net eth0 dhcp,tcpflags,nosmurfs,routefilter,logmartians,sourceroute=0
loc eth1 tcpflags,nosmurfs,routefilter,logmartians

2
Shorewall6/Samples6/Universal/interfaces
View File

@ -11,5 +11,5 @@ FORMAT 2
###############################################################################
#ZONE INTERFACE OPTIONS
- lo ignore
net all dhcp,physical=+,routeback
net all dhcp,physical=+,routeback,sourceroute=0

2
Shorewall6/Samples6/three-interfaces/interfaces
View File

@ -14,6 +14,6 @@
FORMAT 2
###############################################################################
#ZONE INTERFACE OPTIONS
net eth0 tcpflags,forward=1
net eth0 tcpflags,forward=1,sourceroute=0
loc eth1 tcpflags,forward=1
dmz eth2 tcpflags,forward=1

2
Shorewall6/Samples6/two-interfaces/interfaces
View File

@ -14,5 +14,5 @@
FORMAT 2
###############################################################################
#ZONE INTERFACE OPTIONS
net eth0 tcpflags,forward=1
net eth0 tcpflags,forward=1,sourceroute=0
loc eth1 tcpflags,forward=1