extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-18 20:30:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct handling of existing notrack file.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-08-16 14:46:48 -07:00
parent 8d3cf6428f
commit 0a4f26a318
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,15 +201,16 @@ sub process_format( $ ) {
sub setup_conntrack() {
my $format = 1;
my $action = 'NOTRACK';
for my $name ( qw/notrack conntrack/ ) {
my $fn = open_file( $name );
if ( $fn ) {
my $format = 1;
my $action = 'NOTRACK';
my $empty = 1;
first_entry( "$doing $fn..." );
@ -224,11 +225,6 @@ sub setup_conntrack() {
$format = process_format( $dest );
next;
}
if ( $source eq 'COMMENT' ) {
process_comment;
next;
}
} else {
( $action, $source, $dest, $proto, $ports, $sports, $user ) = split_line1 'Conntrack File', { action => 0, source => 1, dest => 2, proto => 3, dport => 4, sport => 5, user => 6 }, { COMMENT => 0, FORMAT => 2 };
@ -237,11 +233,11 @@ sub setup_conntrack() {
$action = 'NOTRACK';
next;
}
}
if ( $action eq 'COMMENT' ) {
process_comment;
next;
}
if ( $action eq 'COMMENT' ) {
process_comment;
next;
}
$empty = 0;
@ -257,11 +253,15 @@ sub setup_conntrack() {
clear_comment;
if ( $empty && $name eq 'notrack') {
if ( unlink( $fn ) ) {
warning_message "Empty notrack file ($fn) removed";
if ( $name eq 'notrack') {
if ( $empty ) {
if ( unlink( $fn ) ) {
warning_message "Empty notrack file ($fn) removed";
} else {
warning_message "Unable to remove empty notrack file ($fn): $!";
}
} else {
warning_message "Unable to remove empty notrack file ($fn): $!";
warning_message "Non-empty notrack file ($fn); please move its contents to the conntrack file";
}
}
}