From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG12479: Copied NAT rule in Firewall displays incorrect source Port Date: Fri, 19 Mar 2021 18:32:19 +0100 Message-ID: <20210319173219.13692-1-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7969831407961876101==" List-Id: --===============7969831407961876101== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Fixes: #12479 When copying a NAT rule in the firewall the existing sourceport is copied, to= o. This Fix deletes the sourceport from a copied NAT rule. After Saving, the cor= rect port is used. Signed-off-by: Alexander Marx --- html/cgi-bin/firewall.cgi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 1483e779f..532f99f91 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1552,6 +1552,11 @@ sub newrule $fwdfwsettings{'USE_NAT'} =3D $hash{$key}[28]; $fwdfwsettings{'nat'} =3D $hash{$key}[31]; #changed order $fwdfwsettings{$fwdfwsettings{'nat'}} =3D $hash{$key}[29]; + #Fix BUG 12479 + #When copying a DNAT Rule, the sourceport has to be empty at this point. + if($hash{$key}[14] eq 'cust_srv' and $hash{$key}[31] eq 'dnat'){ + $hash{$key}[30] =3D ''; + } $fwdfwsettings{'dnatport'} =3D $hash{$key}[30]; $fwdfwsettings{'LIMIT_CON_CON'} =3D $hash{$key}[32]; $fwdfwsettings{'concon'} =3D $hash{$key}[33]; --=20 2.25.1 --===============7969831407961876101==--