webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

firewall: rules.pl: Fix rules with other NAT port.

Browse Source
This commit is contained in:
Michael Tremer
2014-03-21 12:40:55 +01:00
parent 0d0df35ca2
commit d7a14d01e1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
config/firewall/rules.pl
View File

@@ -246,7 +246,7 @@ sub buildrules {
}
# Prepare protocol options (like ICMP types, ports, etc...).
my @protocol_options = &get_protocol_options($hash, $key, $protocol);
my @protocol_options = &get_protocol_options($hash, $key, $protocol, 0);
# Check if this protocol knows ports.
my $protocol_has_ports = ($protocol ~~ @PROTOCOLS_WITH_PORTS);
@@ -271,7 +271,6 @@ sub buildrules {
# Append protocol.
if ($protocol ne "all") {
push(@options, ("-p", $protocol));
push(@options, @protocol_options);
}
@@ -313,7 +312,11 @@ sub buildrules {
&add_dnat_mangle_rules($nat_address, @options);
}
my @nat_options = @options;
my @nat_options = ();
if ($protocol ne "all") {
my @nat_protocol_options = &get_protocol_options($hash, $key, $protocol, 1);
push(@nat_options, @nat_protocol_options);
}
push(@nat_options, @source_options);
push(@nat_options, ("-d", $nat_address));
@@ -701,8 +704,16 @@ sub get_protocol_options {
my $hash = shift;
my $key = shift;
my $protocol = shift;
my $nat_options_wanted = shift;
my @options = ();
# Nothing to do if no protocol is specified.
if ($protocol eq "all") {
return @options;
} else {
push(@options, ("-p", $protocol));
}
# Process source ports.
my $use_src_ports = ($$hash{$key}[7] eq "ON");
my $src_ports = $$hash{$key}[10];
@@ -720,7 +731,7 @@ sub get_protocol_options {
my $dst_ports = $$hash{$key}[15];
if (($dst_ports_mode eq "TGT_PORT") && $dst_ports) {
if ($use_dnat && $$hash{$key}[30]) {
if ($nat_options_wanted && $use_dnat && $$hash{$key}[30]) {
$dst_ports = $$hash{$key}[30];
}
push(@options, &format_ports($dst_ports, "dst"));