[PATCH] traffic.cgi: Do not use hard-coded red interface name

[PATCH] traffic.cgi: Do not use hard-coded red interface name

[Stefan Schantl]

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

If QMI is used the dial in mode has to be set as ppp dialin but the
interface name is red. In such a case the old code tried to display
the stats for the ppp0 interface which is wrong.

This patch fixes this issue by calling the handy function to get
the correct interface name for red.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/traffic.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
index 2f28537d0..67cea7c2e 100644
--- a/html/cgi-bin/traffic.cgi
+++ b/html/cgi-bin/traffic.cgi
@@ -55,12 +55,12 @@ display_vnstat($netsettings{'GREEN_DEV'});
 
 # Display external network / check if it is PPP or ETH
 # and dont display if RED_DEV=GREEN_DEV (green only mode)
-if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
-    if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) {
-	display_vnstat($netsettings{'RED_DEV'});
-    }
-} else {
-    display_vnstat("ppp0");
+if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) {
+	# Omit the red interface name.
+	my $red_iface = &General::get_red_interface();
+
+	# Display the red stats if a device could be grabbed.
+	display_vnstat($red_iface) if ($red_iface);
 }
 
 # Check config and display aditional Networks (BLUE and ORANGE)
-- 
2.30.2

Re: [PATCH] traffic.cgi: Do not use hard-coded red interface name

[Peter Müller]

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

Good catch, thank you!

Acked-by: Peter Müller <peter.mueller(a)ipfire.org>

> If QMI is used the dial in mode has to be set as ppp dialin but the
> interface name is red. In such a case the old code tried to display
> the stats for the ppp0 interface which is wrong.
> 
> This patch fixes this issue by calling the handy function to get
> the correct interface name for red.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  html/cgi-bin/traffic.cgi | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
> index 2f28537d0..67cea7c2e 100644
> --- a/html/cgi-bin/traffic.cgi
> +++ b/html/cgi-bin/traffic.cgi
> @@ -55,12 +55,12 @@ display_vnstat($netsettings{'GREEN_DEV'});
>  
>  # Display external network / check if it is PPP or ETH
>  # and dont display if RED_DEV=GREEN_DEV (green only mode)
> -if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
> -    if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) {
> -	display_vnstat($netsettings{'RED_DEV'});
> -    }
> -} else {
> -    display_vnstat("ppp0");
> +if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) {
> +	# Omit the red interface name.
> +	my $red_iface = &General::get_red_interface();
> +
> +	# Display the red stats if a device could be grabbed.
> +	display_vnstat($red_iface) if ($red_iface);
>  }
>  
>  # Check config and display aditional Networks (BLUE and ORANGE)