Firewall: rename Protocol 41 in Dropdown and ruletable ->Now "IPv6 Encapsulation...

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index c7c9fbda7b479a8735133034b24ca8c89f296cf2..6e11176f279288742f884b4571382f53e6b2779c 100755 (executable)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1757,7 +1757,11 @@ END
                        if ($_ eq $fwdfwsettings{'PROT'}) {
                                print " selected=\"selected\"";
                        }
-                       print ">$_</option>";
+                       if($_ eq "IPv6"){
+                               print ">$Lang::tr{'fwdfw prot41'}</option>";
+                       }else{
+                               print ">$_</option>";
+                       }
                }
                print<<END;
                                                </select>
@@ -2467,7 +2471,11 @@ END
                        #Get Protocol
                        my $prot;
                        if ($$hash{$key}[8]){
-                               push (@protocols,$$hash{$key}[8]);
+                               if ($$hash{$key}[8] eq "IPv6"){
+                                       push (@protocols,"IPv6 Encap")
+                               }else{
+                                       push (@protocols,$$hash{$key}[8]);
+                               }
                        }elsif($$hash{$key}[14] eq 'cust_srv'){
                                &get_serviceports("service",$$hash{$key}[15]);
                        }elsif($$hash{$key}[14] eq 'cust_srvgrp'){

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ce48d69489d8d6e1b1d4317b2c54deaf2ee184fe..5abadb75b6af9cfb86055c06164711b6ca036f52 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -963,6 +963,7 @@
 'fwdfw pol text' => 'Firewall-Standardverhalten für Verbindungen aus lokalen Netzwerken: Alle Verbindungen können entweder zugelassen oder geblockt werden, wenn keine Ausnahmeregel zutrifft. "Blockiert" trennt ebenfalls die Kommunikation zwischen den lokalen Netzwerken.',
 'fwdfw pol text1' => 'Firewall-Standardverhalten für von der Firewall selbst initiierte Verbindungen.',
 'fwdfw pol title' => 'Standardverhalten der Firewall',
+'fwdfw prot41' => 'IPv6 Encapsulation (Protokoll 41)',
 'fwdfw red' => 'ROT',
 'fwdfw reread' => 'Änderungen übernehmen',
 'fwdfw rule action' => 'Regelaktion:',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c3e4c3eb2d963d0cae06e8124ef70f41852b4af2..4915b5859de4023d8da2acb8ae58b709735433c2 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -988,6 +988,7 @@
 'fwdfw pol text' => 'Sets the default firewall behaviour for connections from local networks. You may either allow all new connections or block them by default. Connections between the local networks are also blocked in the latter mode.',
 'fwdfw pol text1' => 'Sets the default firewall behaviour for connections initiated by the firewall itself. Attention! You may lock yourself out.',
 'fwdfw pol title' => 'Default firewall behaviour',
+'fwdfw prot41' => 'IPv6 Encapsulation (Protocol 41)',
 'fwdfw red' => 'RED',
 'fwdfw reread' => 'Apply changes',
 'fwdfw rule action' => 'Rule action:',