extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-03 03:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace a couple of lists of scalars with arrays; document move of process_rules1()

Browse Source
This commit is contained in:
Tom Eastep 2010-12-12 07:29:46 -08:00
parent 138e49276d
commit 13c4d21762
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/Actions.pm
View File

@ -20,9 +20,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# This module contains the code for dealing with actions (built-in, # This module contains the mid-level processing code for the rules file.
# standard and user-defined) and Macros. It also contains process_rule_common() which
# performs low-level rule processing.
# #
package Shorewall::Actions; package Shorewall::Actions;
require Exporter; require Exporter;
@ -467,7 +465,7 @@ sub process_macro1 ( $$ ) {
push_open( $macrofile ); push_open( $macrofile );
while ( read_a_line ) { while ( read_a_line ) {
my ( $mtarget, $msource, $mdest, $mproto, $mports, $msports, $morigdest, $mrate, $muser ) = split_line1 1, 9, 'macro file', $macro_commands; my ( $mtarget, @rest ) = split_line1 1, 9, 'macro file', $macro_commands;
next if $mtarget eq 'COMMENT' || $mtarget eq 'FORMAT'; next if $mtarget eq 'COMMENT' || $mtarget eq 'FORMAT';
@ -598,7 +596,7 @@ sub process_actions1() {
while ( read_a_line ) { while ( read_a_line ) {
my ($wholetarget, $source, $dest, $proto, $ports, $sports, $rate, $users, $mark ) = split_line 1, 9, 'action file'; my ($wholetarget, @rest ) = split_line 1, 9, 'action file';
process_action1( $action, $wholetarget ); process_action1( $action, $wholetarget );

4
Shorewall/changelog.txt
View File

@ -2,6 +2,10 @@ Changes in Shorewall 4.4.16 Beta 5
1) Fix broken logical naming with Proxy ARP. 1) Fix broken logical naming with Proxy ARP.
2) Add support for proxyndp.
3) Move mid-level rule processing to the Actions module.
Changes in Shorewall 4.4.16 Beta 4 Changes in Shorewall 4.4.16 Beta 4
1) Only issue get_params() warnings under 'trace' 1) Only issue get_params() warnings under 'trace'