[PATCH] BUG11695: Adding/editing rules with preset broken

[PATCH] BUG11695: Adding/editing rules with preset broken

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

added another check to fill same ports in source and destination when a custom service is selected.

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Reported-by: erik(a)vanlinsteeict.nl
---
 html/cgi-bin/firewall.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 499f279..d17afab 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -757,6 +757,7 @@ sub checkrule
 				}
 			}
 			if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$custsrvport;}
+			if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'cust_srv'){$fwdfwsettings{'dnatport'}=$custsrvport;}
 		}
 		#check if DNAT port is multiple
 		if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} ne ''){
-- 
2.7.4

Re: [PATCH] BUG11695: Adding/editing rules with preset broken

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

Hello,

what are we doing about systems that already have some value in the external
port setting?

-Michael

On Thu, 2018-05-24 at 14:26 +0200, Alexander Marx wrote:
> added another check to fill same ports in source and destination when a custom
> service is selected.
> 
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> Reported-by: erik(a)vanlinsteeict.nl
> ---
>  html/cgi-bin/firewall.cgi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
> index 499f279..d17afab 100644
> --- a/html/cgi-bin/firewall.cgi
> +++ b/html/cgi-bin/firewall.cgi
> @@ -757,6 +757,7 @@ sub checkrule
>  				}
>  			}
>  			if($fwdfwsettings{'nat'} eq 'dnat' &&
> $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$custsrvport;}
> +			if($fwdfwsettings{'nat'} eq 'dnat' &&
> $fwdfwsettings{'grp3'} eq
> 'cust_srv'){$fwdfwsettings{'dnatport'}=$custsrvport;}
>  		}
>  		#check if DNAT port is multiple
>  		if($fwdfwsettings{'nat'} eq 'dnat' &&
> $fwdfwsettings{'dnatport'} ne ''){

Re: [PATCH] BUG11695: Adding/editing rules with preset broken

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1538 bytes --]

Hello List,

as already described in the bug entry on bugzilla
(https://bugzilla.ipfire.org/show_bug.cgi?id=11695) I'm unable to
reproduce the origin bug anymore.

As I discovered in the GIT history this patch never has been merged and
because the bug does not exist anymore this patch is not longer
required.

Best regards,

-Stefan
> added another check to fill same ports in source and destination when
> a custom service is selected.
> 
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> Reported-by: erik(a)vanlinsteeict.nl
> ---
>  html/cgi-bin/firewall.cgi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
> index 499f279..d17afab 100644
> --- a/html/cgi-bin/firewall.cgi
> +++ b/html/cgi-bin/firewall.cgi
> @@ -757,6 +757,7 @@ sub checkrule
>                                 }
>                         }
>                         if($fwdfwsettings{'nat'} eq 'dnat' &&
> $fwdfwsettings{'dnatport'} eq
> ''){$fwdfwsettings{'dnatport'}=$custsrvport;}
> +                       if($fwdfwsettings{'nat'} eq 'dnat' &&
> $fwdfwsettings{'grp3'} eq
> 'cust_srv'){$fwdfwsettings{'dnatport'}=$custsrvport;}
>                 }
>                 #check if DNAT port is multiple
>                 if($fwdfwsettings{'nat'} eq 'dnat' &&
> $fwdfwsettings{'dnatport'} ne ''){