[PATCH 1/4] graphs.pl: fix spelling of "SYN"

[PATCH 1/4] graphs.pl: fix spelling of "SYN"

[Peter Müller]

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

This merely is a cosmetic change, but since we are dealing with network
packets here, the SYN flag must be capitalised.

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 config/cfgroot/graphs.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 1bed49fa3..872e9bd7c 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -698,7 +698,7 @@ sub updatefwhitsgraph {
 		"GPRINT:input:AVERAGE:%8.1lf %sBps",
 		"GPRINT:input:MIN:%8.1lf %sBps",
 		"GPRINT:input:LAST:%8.1lf %sBps\\j",
-		"STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSyn"),
+		"STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
 		"GPRINT:newnotsyn:MAX:%8.1lf %sBps",
 		"GPRINT:newnotsyn:MIN:%8.1lf %sBps",
 		"GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
-- 
2.16.4

[PATCH 2/4] en.pl: fix spelling of "SYN"

[Peter Müller]

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

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 langs/en/cgi-bin/en.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3f3e46641..3db17ce64 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -921,7 +921,7 @@
 'drop action2' => 'Default behaviour of (input) firewall',
 'drop forward' => 'Log dropped forward packets',
 'drop input' => 'Log dropped input packets',
-'drop newnotsyn' => 'Log dropped new not syn packets',
+'drop newnotsyn' => 'Log dropped new not SYN packets',
 'drop outgoing' => 'Log dropped outgoing packets',
 'drop portscan' => 'Log dropped portscan packets',
 'drop proxy' => 'Drop all packets not addressed to proxy',
-- 
2.16.4

[PATCH 3/4] de.pl: mention technical detail regarding new not SYN packets

[Peter Müller]

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

Since an appropriate translation of the firewall hits graph is not
possible due to limited space, mentioning "NewNotSYN" at least clarifies
the relationship between "Verworfene neue Pakete ohne SYN-Markierung
protokollieren" and "NewNotSYN".

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 langs/de/cgi-bin/de.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index c3702cc09..64df1abe5 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -900,7 +900,7 @@
 'drop action2' => 'Standardverhalten der (Input) Firewall',
 'drop forward' => 'Verworfene, von der Firewall weitergeleitete Pakete protokollieren',
 'drop input' => 'Verworfene eingehende Pakete protokollieren',
-'drop newnotsyn' => 'Verworfene neue Pakete ohne SYN-Markierung protokollieren',
+'drop newnotsyn' => 'Verworfene neue Pakete ohne SYN-Markierung protokollieren (NewNotSYN)',
 'drop outgoing' => 'Verworfene, von der Firewall ausgehende Pakete protokollieren',
 'drop portscan' => 'Verworfene Portscan Pakete protokollieren',
 'drop proxy' => 'Alle Pakete verwerfen, die nicht direkt an den Proxy gerichtet sind',
-- 
2.16.4

[PATCH 4/4] graphs.pl: use brackets instead of hypens

[Peter Müller]

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

This simply makes more sense in most languages, as INPUT, OUTPUT and
FORWARD are special cases of firewall hits in general.

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 config/cfgroot/graphs.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 872e9bd7c..7b056d117 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -683,17 +683,17 @@ sub updatefwhitsgraph {
 		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
 		"COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
 		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
-		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-OUTPUT"),
+		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
 		"GPRINT:output:MAX:%8.1lf %sBps",
 		"GPRINT:output:AVERAGE:%8.1lf %sBps",
 		"GPRINT:output:MIN:%8.1lf %sBps",
 		"GPRINT:output:LAST:%8.1lf %sBps\\j",
-		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-FORWARD"),
+		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
 		"GPRINT:forward:MAX:%8.1lf %sBps",
 		"GPRINT:forward:AVERAGE:%8.1lf %sBps",
 		"GPRINT:forward:MIN:%8.1lf %sBps",
 		"GPRINT:forward:LAST:%8.1lf %sBps\\j",
-		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-INPUT"),
+		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
 		"GPRINT:input:MAX:%8.1lf %sBps",
 		"GPRINT:input:AVERAGE:%8.1lf %sBps",
 		"GPRINT:input:MIN:%8.1lf %sBps",
-- 
2.16.4

Re: [PATCH 1/4] graphs.pl: fix spelling of "SYN"

[Michael Tremer]

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

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 27 Apr 2020, at 16:24, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> This merely is a cosmetic change, but since we are dealing with network
> packets here, the SYN flag must be capitalised.
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> config/cfgroot/graphs.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
> index 1bed49fa3..872e9bd7c 100644
> --- a/config/cfgroot/graphs.pl
> +++ b/config/cfgroot/graphs.pl
> @@ -698,7 +698,7 @@ sub updatefwhitsgraph {
> 		"GPRINT:input:AVERAGE:%8.1lf %sBps",
> 		"GPRINT:input:MIN:%8.1lf %sBps",
> 		"GPRINT:input:LAST:%8.1lf %sBps\\j",
> -		"STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSyn"),
> +		"STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
> 		"GPRINT:newnotsyn:MAX:%8.1lf %sBps",
> 		"GPRINT:newnotsyn:MIN:%8.1lf %sBps",
> 		"GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
> -- 
> 2.16.4

Re: [PATCH 2/4] en.pl: fix spelling of "SYN"

[Michael Tremer]

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

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 27 Apr 2020, at 16:24, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> langs/en/cgi-bin/en.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index 3f3e46641..3db17ce64 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -921,7 +921,7 @@
> 'drop action2' => 'Default behaviour of (input) firewall',
> 'drop forward' => 'Log dropped forward packets',
> 'drop input' => 'Log dropped input packets',
> -'drop newnotsyn' => 'Log dropped new not syn packets',
> +'drop newnotsyn' => 'Log dropped new not SYN packets',
> 'drop outgoing' => 'Log dropped outgoing packets',
> 'drop portscan' => 'Log dropped portscan packets',
> 'drop proxy' => 'Drop all packets not addressed to proxy',
> -- 
> 2.16.4

Re: [PATCH 3/4] de.pl: mention technical detail regarding new not SYN packets

[Michael Tremer]

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

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 27 Apr 2020, at 16:24, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> Since an appropriate translation of the firewall hits graph is not
> possible due to limited space, mentioning "NewNotSYN" at least clarifies
> the relationship between "Verworfene neue Pakete ohne SYN-Markierung
> protokollieren" and "NewNotSYN".
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> langs/de/cgi-bin/de.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index c3702cc09..64df1abe5 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -900,7 +900,7 @@
> 'drop action2' => 'Standardverhalten der (Input) Firewall',
> 'drop forward' => 'Verworfene, von der Firewall weitergeleitete Pakete protokollieren',
> 'drop input' => 'Verworfene eingehende Pakete protokollieren',
> -'drop newnotsyn' => 'Verworfene neue Pakete ohne SYN-Markierung protokollieren',
> +'drop newnotsyn' => 'Verworfene neue Pakete ohne SYN-Markierung protokollieren (NewNotSYN)',
> 'drop outgoing' => 'Verworfene, von der Firewall ausgehende Pakete protokollieren',
> 'drop portscan' => 'Verworfene Portscan Pakete protokollieren',
> 'drop proxy' => 'Alle Pakete verwerfen, die nicht direkt an den Proxy gerichtet sind',
> -- 
> 2.16.4

Re: [PATCH 4/4] graphs.pl: use brackets instead of hypens

[Michael Tremer]

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

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 27 Apr 2020, at 16:25, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> This simply makes more sense in most languages, as INPUT, OUTPUT and
> FORWARD are special cases of firewall hits in general.
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> config/cfgroot/graphs.pl | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
> index 872e9bd7c..7b056d117 100644
> --- a/config/cfgroot/graphs.pl
> +++ b/config/cfgroot/graphs.pl
> @@ -683,17 +683,17 @@ sub updatefwhitsgraph {
> 		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
> 		"COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
> 		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
> -		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-OUTPUT"),
> +		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
> 		"GPRINT:output:MAX:%8.1lf %sBps",
> 		"GPRINT:output:AVERAGE:%8.1lf %sBps",
> 		"GPRINT:output:MIN:%8.1lf %sBps",
> 		"GPRINT:output:LAST:%8.1lf %sBps\\j",
> -		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-FORWARD"),
> +		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
> 		"GPRINT:forward:MAX:%8.1lf %sBps",
> 		"GPRINT:forward:AVERAGE:%8.1lf %sBps",
> 		"GPRINT:forward:MIN:%8.1lf %sBps",
> 		"GPRINT:forward:LAST:%8.1lf %sBps\\j",
> -		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-INPUT"),
> +		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
> 		"GPRINT:input:MAX:%8.1lf %sBps",
> 		"GPRINT:input:AVERAGE:%8.1lf %sBps",
> 		"GPRINT:input:MIN:%8.1lf %sBps",
> -- 
> 2.16.4