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

firewall: Resurrect port forwardings with different external ports.

Browse Source
This commit is contained in:
Michael Tremer
2014-03-02 22:35:27 +01:00
parent 292cad90f7
commit 1c3044d72c
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
config/firewall/rules.pl
View File

@@ -303,22 +303,6 @@ sub buildrules {
if ($dnat_port) {
$dnat_address .= ":$dnat_port";
# Replace --dport with the translated one.
my @new_nat_options = ();
my $skip_count = 0;
foreach my $option (@nat_options) {
next if ($skip_count-- > 0);
if ($option eq "--dport") {
push(@new_nat_options, ("--dport", $dnat_port));
$skip_count = 1;
next;
}
push(@new_nat_options, $option);
}
@nat_options = @new_nat_options;
}
}
@@ -688,11 +672,11 @@ sub get_protocol_options {
if ($use_dst_ports) {
my $dst_ports_mode = $$hash{$key}[14];
my $dst_ports = $$hash{$key}[15];
if ($use_dnat && $$hash{$key}[30]) {
$dst_ports = $$hash{$key}[30];
}
if (($dst_ports_mode eq "TGT_PORT") && $dst_ports) {
if ($use_dnat && $$hash{$key}[30]) {
$dst_ports = $$hash{$key}[30];
}
push(@options, &format_ports($dst_ports, "dst"));
} elsif ($dst_ports_mode eq "cust_srv") {
@@ -738,7 +722,9 @@ sub format_ports {
push(@options, ("-m", "multiport"));
}
push(@options, ($arg, $ports));
if ($ports) {
push(@options, ($arg, $ports));
}
return @options;
}
@@ -748,7 +734,12 @@ sub get_dnat_target_port {
my $key = shift;
if ($$hash{$key}[14] eq "TGT_PORT") {
return $$hash{$key}[15];
my $port = $$hash{$key}[15];
my $external_port = $$hash{$key}[30];
if ($external_port && ($port ne $external_port)) {
return $$hash{$key}[15];
}
}
}