]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/qos.cgi
projects / people / pmueller / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed maniacs files (mail has convertet to "dos")
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / qos.cgi
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 33a6b90c10e522b4e64ed4fca357d310d3ae6e18..d5da1fd9122c7bf3504d3d5f99e64b1f7b8bc944 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -243,15 +243,15 @@ END
 if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'QIP'}) ) { 
+               unless ( &General::validip($qossettings{'QIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Quell-IP-Adresse ist ungueltig."; 
+                       $message = "Die Quell-IP-Adresse ist ungueltig.";
                }
        }
        if ( $qossettings{'DIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'DIP'}) ) { 
+               unless ( &General::validip($qossettings{'DIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Ziel-IP-Adresse ist ungueltig."; 
+                       $message = "Die Ziel-IP-Adresse ist ungueltig.";
                }
        }
        if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -318,15 +318,15 @@ END
 if ($qossettings{'DOPORT'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'QIP'}) ) { 
+               unless ( &General::validip($qossettings{'QIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Quell-IP-Adresse ist ungueltig."; 
+                       $message = "Die Quell-IP-Adresse ist ungueltig.";
                }
        }
        if ( $qossettings{'DIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'DIP'}) ) { 
+               unless ( &General::validip($qossettings{'DIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Ziel-IP-Adresse ist ungueltig."; 
+                       $message = "Die Ziel-IP-Adresse ist ungueltig.";
                }
        }
        if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -405,7 +405,7 @@ $qossettings{'CLASS'};$qossettings{'DEVICE'};$qossettings{'TOS'};
 END
 ;
        close FILE;
-} 
+}
 elsif ($qossettings{'DOTOS'} eq 'Loeschen')
 {
        open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
@@ -506,30 +506,29 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} )
 imq0;200;1;$DOWN[10];$DOWN[1];;;8;VoIP;
 imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN;
 imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic;
-imq0;210;6;1;$DOWN[1];;;0;Standardklasse;
+imq0;210;6;1;$DOWN[1];;;0;Default;
 imq0;220;7;1;$DOWN[1];;;1;P2P;
-ppp0;101;1;$UP[2];$UP[1];;;8;ACKs oder so;
-ppp0;102;2;$UP[3];$UP[1];;;8;VoIP;
-ppp0;104;5;$UP[10];$UP[1];;;8;Webtraffic;
-ppp0;110;6;1;$UP[1];;;0;Standardklasse;
-ppp0;120;7;1;$UP[1];;;1;P2P;
-ppp0;103;4;$UP[2];$UP[1];;;2;VPN;
+$qossettings{'RED_DEV'};101;1;$UP[2];$UP[1];;;8;ACKs;
+$qossettings{'RED_DEV'};102;2;$UP[3];$UP[1];;;8;VoIP;
+$qossettings{'RED_DEV'};104;5;$UP[10];$UP[1];;;8;Webtraffic;
+$qossettings{'RED_DEV'};110;6;1;$UP[1];;;0;Default;
+$qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P;
+$qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN;
 END
 ;
        close FILE;
        open( FILE, "> $level7file" ) or die "Unable to write $level7file";
        print FILE <<END
-102;ppp0;dns;;;
-102;ppp0;sip;;;
-102;ppp0;skypetoskype;;;
-103;ppp0;ssh;;;
-103;ppp0;rdp;;;
-104;ppp0;http;;;
-104;ppp0;ssl;;;
-104;ppp0;pop3;;;
-110;ppp0;ftp;;;
-120;ppp0;applejuice;;;
-120;ppp0;bittorrent;;;
+102;$qossettings{'RED_DEV'};dns;;;
+102;$qossettings{'RED_DEV'};sip;;;
+102;$qossettings{'RED_DEV'};skypetoskype;;;
+103;$qossettings{'RED_DEV'};ssh;;;
+103;$qossettings{'RED_DEV'};rdp;;;
+104;$qossettings{'RED_DEV'};http;;;
+104;$qossettings{'RED_DEV'};ssl;;;
+104;$qossettings{'RED_DEV'};pop3;;;
+120;$qossettings{'RED_DEV'};applejuice;;;
+120;$qossettings{'RED_DEV'};bittorrent;;;
 200;imq0;skypetoskype;;;
 203;imq0;ssh;;;
 203;imq0;rdp;;;
@@ -538,23 +537,24 @@ END
 204;imq0;ssl;;;
 220;imq0;applejuice;;;
 220;imq0;bittorrent;;;
-210;imq0;ftp;;;
 END
 ;
        close FILE;
        open( FILE, "> $portfile" ) or die "Unable to write $portfile";
        print FILE <<END
-101;ppp0;icmp;;;;;
-102;ppp0;tcp;;;;53;
-102;ppp0;udp;;;;53;
-103;ppp0;esp;;;;;
-103;ppp0;tcp;;;;1194;
-103;ppp0;udp;;4500;;4500;
-103;ppp0;udp;;500;;500;
-104;ppp0;tcp;;;;80;
+101;$qossettings{'RED_DEV'};icmp;;;;;
+102;$qossettings{'RED_DEV'};tcp;;;;53;
+102;$qossettings{'RED_DEV'};udp;;;;53;
+103;$qossettings{'RED_DEV'};esp;;;;;
+103;$qossettings{'RED_DEV'};tcp;;;;1194;
+103;$qossettings{'RED_DEV'};udp;;;;1194;
+103;$qossettings{'RED_DEV'};udp;;4500;;4500;
+103;$qossettings{'RED_DEV'};udp;;500;;500;
+104;$qossettings{'RED_DEV'};tcp;;;;80;
 200;imq0;icmp;;;;;
 203;imq0;esp;;;;;
 203;imq0;tcp;;;;1194;
+203;imq0;udp;;;;1194;
 203;imq0;udp;;4500;;4500;
 203;imq0;udp;;500;;500;
 204;imq0;tcp;;;;80;
@@ -570,10 +570,15 @@ END
        $qossettings{'DEFCLASS_INC'} = "210";
        $qossettings{'DEFCLASS_OUT'} = "110";
        $qossettings{'ACK'} ="101";
+       system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
+       system("/usr/bin/touch /var/ipfire/qos/enable");
+       system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
+       system("logger -t ipfire 'QoS started'");
+       $qossettings{'ENABLED'} = 'on';
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
-       
+
 }
-elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
+elsif ($qossettings{'ACTION'} eq "$Lang::tr{'status'}" )
 {
        &Header::openbox('100%', 'left', 'QoS Status');
        if ($qossettings{'ENABLED'} eq 'on'){
@@ -587,7 +592,7 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
+elsif ($qossettings{'ACTION'} eq "$Lang::tr{'parentclass add'}" )
 {
        &parentclass();
        &Header::closebigbox();
@@ -640,21 +645,21 @@ END
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Erweiterte Einstellungen')
+elsif ($qossettings{'ACTION'} eq "$Lang::tr{'urlfilter advanced settings'}" )
 {
        &expert();
        &Header::closebigbox();
        &Header::closepage();
        exit
 }
-if ($qossettings{'ACTIONBW'} eq 'Andern')
+if ($qossettings{'ACTIONBW'} eq "$Lang::tr{'modify'}" )
 {
        &changebandwidth();
        &Header::closebigbox();
        &Header::closepage();
        exit
 }
-if ($qossettings{'ACTIONDEF'} eq 'Andern')
+if ($qossettings{'ACTIONDEF'} eq "$Lang::tr{'modify'}" )
 {
        &changedefclasses();
        &Header::closebigbox();
@@ -699,8 +704,8 @@ END
                <tr><td width='50%' align='left'><b>Quality of Service:</b>
                    <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font>
                <tr><td width='100%' align='center' colspan='2'>
-               <input type='submit' name='ACTION' value="Start" /> 
-               <input type='submit' name='ACTION' value="Stop" /> 
+               <input type='submit' name='ACTION' value="Start" />
+               <input type='submit' name='ACTION' value="Stop" />
                <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form>
 END
 ;
@@ -710,7 +715,7 @@ END
          <table width='66%'>
                <tr><td colspan='3'>&nbsp;
                <tr><td width='50%' align='right'>$Lang::tr{'downlink speed'}:  <td width='30%' align='left'>$qossettings{'INC_SPD'}
-                   <td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='Andern' />
+                   <td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='$Lang::tr{'modify'}' />
                <tr><td width='50%' align='right'>$Lang::tr{'uplink speed'}:    <td width='30%' align='left'>$qossettings{'OUT_SPD'}
                </table></form>
 END
@@ -721,8 +726,8 @@ END
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='66%'>
                <tr><td colspan='3'><hr />
-               <tr><td width='50%' align='right'>$Lang::tr{'downlink std class'}:      <td width='30%' align='left'>$qossettings{'DEFCLASS_INC'}       
-                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='Andern' />
+               <tr><td width='50%' align='right'>$Lang::tr{'downlink std class'}:      <td width='30%' align='left'>$qossettings{'DEFCLASS_INC'}
+                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='$Lang::tr{'modify'}' />
                <tr><td width='50%' align='right'>$Lang::tr{'uplink std class'}:        <td width='30%' align='left'>$qossettings{'DEFCLASS_OUT'}
                <tr><td width='50%' align='right'>ACKs:                         <td width='30%' align='left'>$qossettings{'ACK'}
                <tr><td colspan='3' width='100%'><hr />
@@ -731,9 +736,9 @@ END
                </form>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table border='0' cellpadding='0' cellspacing='0'>
-                       <tr><td><input type='submit' name='ACTION' value='Parentklasse hinzufuegen' />
-                           <td><input type='submit' name='ACTION' value='Erweiterte Einstellungen' />
-                           <td><input type='submit' name='ACTION' value='Statusinformationen' />
+                       <tr><td><input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' />
+                           <td><input type='submit' name='ACTION' value='$Lang::tr{'urlfilter advanced settings'}' />
+                           <td><input type='submit' name='ACTION' value='$Lang::tr{'status'}' />
                        </tr></table>
        </form>
 END
@@ -770,7 +775,7 @@ if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}-3240.png
                <tr><td colspan='9' align='center'><a href='/cgi-bin/qosgraph.cgi?graph=$qossettings{'IMQ_DEV'}'><img alt="" src="/graphs/qos-graph-$qossettings{'IMQ_DEV'}-3240.png" border='0' /></a></td></tr>
 END
 ;}
-else 
+else
 {
 print "\t</table><br />".$Lang::tr{'no information available'};
 }
@@ -799,7 +804,7 @@ END
                for ( $c = 200 ; $c <= 220 ; $c++ )
                {
                        if ( $qossettings{'DEFCLASS_INC'} ne $c )
-                       { print "<option value='$c'>$c</option>\n"; } 
+                       { print "<option value='$c'>$c</option>\n"; }
                        else    { print "<option selected value='$c'>$c</option>\n"; }
                }
                print <<END
@@ -872,7 +877,7 @@ END
        if ( $message ne "" ) {
                print "<tr><td colspan='3' align='center'>$message";
        }
-       if ( $qossettings{'EDIT'} eq 'yes' ) { 
+       if ( $qossettings{'EDIT'} eq 'yes' ) {
                print "<input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' />";
                print "<input type='hidden' name='DEVICE' value='$qossettings{'DEVICE'}' />";
        }
@@ -882,7 +887,7 @@ END
                    <td width='33%' align='left'>
 END
 ;
-               if ( $qossettings{'EDIT'} eq 'yes' ) { 
+               if ( $qossettings{'EDIT'} eq 'yes' ) {
                        print "<select name='DEVICE' disabled>";
                } else {
                        print "<select name='DEVICE'>";
@@ -899,7 +904,7 @@ END
                <tr><td width='33%' align='right'>$Lang::tr{'Class'}:<td width='33%' align='left'>
 END
 ;
-               if ( $qossettings{'EDIT'} eq 'yes' ) { 
+               if ( $qossettings{'EDIT'} eq 'yes' ) {
                        print "<select name='CLASS' disabled>";
                } else {
                        print "<select name='CLASS'>";
@@ -1067,7 +1072,7 @@ END
                        next if -d "/etc/l7-protocols/protocols/$direntry";
                        @proto = split( /\./, $direntry );
                        if ( $proto[0] eq $qossettings{'L7PROT'} ) {
-                               print "<option value='$proto[0]' selected>$proto[0]</option>\n";                        
+                               print "<option value='$proto[0]' selected>$proto[0]</option>\n";
                        } else {
                                print "<option value='$proto[0]'>$proto[0]</option>\n";
                        }
@@ -1105,7 +1110,7 @@ END
                                @tmpline = split( /\ /, $direntry );
                                next if $tmpline[0] =~ "#";
                                if ( $tmpline[0] eq $qossettings{'PPROT'} ) {
-                                       print "<option value='$tmpline[0]' selected>$tmpline[0]</option>\n";                    
+                                       print "<option value='$tmpline[0]' selected>$tmpline[0]</option>\n";
                                } else {
                                        print "<option value='$tmpline[0]'>$tmpline[0]</option>\n";
                                }
@@ -1149,7 +1154,7 @@ END
                <tr><td width='50%' align='left'>$Lang::tr{'min delay'} (8)             <td width='50%'><input type="radio" name="TOS" value="8" $checked[8] />
                <tr><td width='50%' align='left'>$Lang::tr{'max throughput'} (4)                <td width='50%'><input type="radio" name="TOS" value="4" $checked[4] />
                <tr><td width='50%' align='left'>$Lang::tr{'max reliability'} (2)       <td width='50%'><input type="radio" name="TOS" value="2" $checked[2] />
-               <tr><td width='50%' align='left'$Lang::tr{'min costs'} (1)                      <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
+               <tr><td width='50%' align='left'>$Lang::tr{'min costs'} (1)                     <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
                <tr><td width='100%' align='right' colspan='2'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOTOS' value='$Lang::tr{'save'}' />
                </table></form>
 END
@@ -1287,14 +1292,14 @@ END
 ;
                                                if ($portruleline[4]) {
                                                        print <<END
-                                   <i>Quell-Port:</i> $portruleline[4]
+                                   <i>$Lang::tr{'source port'}:</i> $portruleline[4]
 END
 ;
                                                }
                                                print "<td align='center' colspan='2'>";
                                                if ($portruleline[6]) {
                                                        print <<END
-                                   <i>Ziel-Port:</i> $portruleline[6]
+                                   <i>$Lang::tr{'destination port'}:</i> $portruleline[6]
 END
 ;
                                                }
Peter's tree of IPFire 2.x