]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/qos.cgi
QoS-Graphen wieder eingebaut.
[ipfire-2.x.git] / html / cgi-bin / qos.cgi
index 56047c8a76f10bdb4b43232133e47976c9f343a7..5e600ed569c3da949f3bcf5db4164c39ef568f69 100644 (file)
@@ -488,76 +488,6 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Grafische Auswertung')
-{
-       open( FILE, "< $classfile" ) or die "Unable to read $classfile";
-       @classes = <FILE>;
-       close FILE;
-       open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
-       @subclasses = <FILE>;
-       close FILE;
-       &Header::openbox('100%', 'left', 'QoS Graphen');
-       print <<END
-       <table width='100%'>    <tr><td align='center'><font color='red'>Diese Seite braucht je nach Geschwindigkeit des Computers laenger zum Laden.</font>
-                               <tr><td align='center'><b>Klasse:</b> 
-END
-;
-       foreach $classentry (sort @classes)
-       {
-               @classline = split( /\;/, $classentry );
-               $qossettings{'CLASS'}=$classline[1];
-               print <<END
-               <input type="button" onClick="swapVisibility('$qossettings{'CLASS'}')" value='$qossettings{'CLASS'}' />
-END
-;
-       }
-       print <<END
-       </table>
-END
-;
-       &Header::closebox();
-       foreach $classentry (sort @classes)
-       {
-               @classline = split( /\;/, $classentry );
-               $qossettings{'DEV'}=$classline[0];
-               $qossettings{'CLASS'}=$classline[1];
-               &gengraph($qossettings{'DEV'},$qossettings{'CLASS'});
-               print "<div id='$qossettings{'CLASS'}' style='display: none'>";
-               &Header::openbox('100%', 'center', "$qossettings{'CLASS'} ($qossettings{'DEV'})");
-               print <<END
-               <table>
-               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png' />
-               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-borrowed.png' />
-               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-bytes.png' />
-END
-;
-               foreach $subclassentry (sort @subclasses)
-               {
-                       @subclassline = split( /\;/, $subclassentry );
-                       if ($subclassline[1] eq $classline[1]) {
-                               $qossettings{'DEV'}=$subclassline[0];
-                               $qossettings{'SCLASS'}=$subclassline[2];
-                               &gengraph($qossettings{'DEV'},$qossettings{'SCLASS'});
-                               print <<END
-                               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-packets.png' />
-                               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-borrowed.png' />
-                               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-bytes.png' />
-END
-;
-                       }
-               }
-               print "\t\t</table>";
-               &Header::closebox();    
-               print "</div>\n";
-       }
-print <<END
-       </table>
-END
-;
-       &Header::closebigbox();
-       &Header::closepage();
-       exit
-}
 elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
 {
        &parentclass();
@@ -704,9 +634,8 @@ END
                <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' />
-                       <tr><td><input type='submit' name='ACTION' value='Statusinformationen' />
-                           <td><input type='submit' name='ACTION' value='Grafische Auswertung' />
-               </table>
+                           <td><input type='submit' name='ACTION' value='Statusinformationen' />
+                       </tr></table>
        </form>
 END
 ;
@@ -841,8 +770,8 @@ END
                print "<tr><td colspan='3' align='center'>$message";
        }
        if ( $qossettings{'EDIT'} eq 'yes' ) { 
-               print "<input type='hidden' name='CLASS' value=$qossettings{'CLASS'} />";
-               print "<input type='hidden' name='DEVICE' value=$qossettings{'DEVICE'} />";
+               print "<input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' />";
+               print "<input type='hidden' name='DEVICE' value='$qossettings{'DEVICE'}' />";
        }
        print <<END
                <tr><td width='100%' colspan='3'>Geben sie die Daten ein <br /> und klicken Sie danach auf <i>Speichern</i>.
@@ -861,8 +790,8 @@ END
                        $qossettings{'IMQ_DEV_SEL'} = 'selected';
                }
                print <<END
-                       <option value=$qossettings{'RED_DEV'} $qossettings{'RED_DEV_SEL'}>$qossettings{'RED_DEV'}</option>
-                       <option value=$qossettings{'IMQ_DEV'} $qossettings{'IMQ_DEV_SEL'}>$qossettings{'IMQ_DEV'}</option></select>
+                       <option value='$qossettings{'RED_DEV'}' $qossettings{'RED_DEV_SEL'}>$qossettings{'RED_DEV'}</option>
+                       <option value='$qossettings{'IMQ_DEV'}' $qossettings{'IMQ_DEV_SEL'}>$qossettings{'IMQ_DEV'}</option></select>
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Klasse:<td width='33%' align='left'>
 END
@@ -924,7 +853,7 @@ END
                    <td width='66%' colspan='2' align='left'><input type='text' name='REMARK' size='40' maxlength='40' value="$qossettings{'REMARK'}" /> <img alt="" alt='blob' src='/blob.gif' />
                <tr><td width='33%' align='right'>&nbsp;
                    <td width='33%' align='left'>&nbsp;
-                   <td width='33%' align='center'><input type='submit' name='DOCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
+                   <td width='33%' align='center'><input type='submit' name='DOCLASS' value='$Lang::tr{'save'}' />&nbsp;<input type='reset' value='$Lang::tr{'reset'}' />
                </table></form>
 END
 ;
@@ -999,7 +928,7 @@ END
                                <option value='1'>Minimale Kosten (1)</option></select>
                    <td width='33%' align='center'><input type='hidden' name='CLASS' value="$qossettings{'CLASS'}" />
                                                        <input type='hidden' name='DEVICE' value="$qossettings{'DEVICE'}" />
-                                                       <input type='submit' name='DOSCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
+                                                       <input type='submit' name='DOSCLASS' value='$Lang::tr{'save'}' />&nbsp;<input type='reset' value='$Lang::tr{'reset'}' />
                </table></form>
 END
 ;
@@ -1040,11 +969,11 @@ END
        print <<END
                    </select><td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Quell-IP-Adresse:
-                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value=$qossettings{'QIP'} />
+                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Ziel-IP-Adresse:
-                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value=$qossettings{'DIP'} />
-                   <td width='33%' align='center'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'} /><input type='submit' name='DOLEVEL7' value=$Lang::tr{'save'} />
+                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+                   <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOLEVEL7' value='$Lang::tr{'save'}' />
                </table></form>
 END
 ;
@@ -1077,17 +1006,17 @@ END
        print <<END
                    </select><td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Quell-Port:
-                   <td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value=$qossettings{'QPORT'} />
+                   <td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value='$qossettings{'QPORT'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Ziel-Port:
-                   <td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value=$qossettings{'DPORT'} />
+                   <td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value='$qossettings{'DPORT'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Quell-IP-Adresse:
-                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value=$qossettings{'QIP'} />
+                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Ziel-IP-Adresse:
-                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value=$qossettings{'DIP'} />
-                   <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOPORT' value=$Lang::tr{'save'} />
+                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+                   <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOPORT' value='$Lang::tr{'save'}' />
                </table></form>
 END
 ;
@@ -1114,7 +1043,7 @@ END
                <tr><td width='50%' align='left'>Maximaler Durchsatz (4)                <td width='50%'><input type="radio" name="TOS" value="4" $checked[4] />
                <tr><td width='50%' align='left'>Maximale Zuverlaessigkeit (2)  <td width='50%'><input type="radio" name="TOS" value="2" $checked[2] />
                <tr><td width='50%' align='left'>Minimale Kosten (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'} />
+               <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
 ;
@@ -1144,8 +1073,7 @@ sub showclasses {
                        @classline = split( /\;/, $classentry );
                        if ( $classline[0] eq $qossettings{'DEV'} )
                        {
-                               gengraph($qossettings{'DEV'},$classline[1]);
-                               &Header::openbox('100%', 'center', "Klasse: $classline[1]");
+                         &Header::openbox('100%', 'center', "Klasse: $classline[1]");
                                print <<END
                                <table border='0' width='100%' cellspacing='0'>
                                <tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
@@ -1348,15 +1276,8 @@ END
                                                }
                                        }
                                }
-
-                               if ( -e "/srv/web/ipfire/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png") {
-                                       print <<END
-                                       <tr><td colspan='9' align='center'><img alt="" src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png' />
 END
 ;
-                               }
-
-
                                foreach $subclassentry (sort @subclasses)
                                {
                                        @subclassline = split( /\;/, $subclassentry );
@@ -1396,11 +1317,11 @@ END
                        </table>
 END
 ;
-                       &Header::closebox();
+                 &Header::closebox();
                        }
-               }
+                       }
+       }
        }
-}
 
 sub expert
 {
@@ -1409,14 +1330,14 @@ sub expert
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='66%'>
                <tr><td width='33%' align='right'>MTU:<td width='33%' align='left'>
-                       <input type='text' name='MTU' maxlength='8' required='4' value=$qossettings{'MTU'} />
+                       <input type='text' name='MTU' maxlength='8' required='4' value='$qossettings{'MTU'}' />
                    <td width='33%' align='center'>Diese Einstellung aendert die MTU nicht global sondern nur fuer das QoS.
                <tr><td width='33%' align='right'>Queue Laenge:<td width='33%' align='left'>
-                       <input type='text' name='QLENGTH' maxlength='8' required='2' value=$qossettings{'QLENGTH'} />
+                       <input type='text' name='QLENGTH' maxlength='8' required='2' value='$qossettings{'QLENGTH'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>SFQ Perturb:<td width='33%' align='left'>
-                       <input type='text' name='SFQ_PERTUB' maxlength='8' required='1' value=$qossettings{'SFQ_PERTUB'} />
-                   <td width='33%' align='center'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
+                       <input type='text' name='SFQ_PERTUB' maxlength='8' required='1' value='$qossettings{'SFQ_PERTUB'}' />
+                   <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
                </table>
                </form>
 END
@@ -1501,38 +1422,6 @@ sub validsubclass {
        }
 }
 
-sub gengraph {
-       $qossettings{'DEV'} = shift;
-       $qossettings{'CLASS'} = shift;
-       my $ERROR="";
-       if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { 
-               $qossettings{'CLASSPRFX'} = '1';
-       } else { 
-               $qossettings{'CLASSPRFX'} = '2';
-       }
-       my $color=random_hex_color(6);
-
-       RRDs::graph ("/srv/web/ipfire/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png",
-               "--start", "-3240", "-aPNG", "-i", "-z",
-               "--alt-y-grid", "-w 600", "-h 150", "-r",
-               "--color", "SHADEA#EAE9EE",
-               "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#FFFFFF",
-               "-t $qossettings{'CLASS'} ($qossettings{'DEV'})",
-               "DEF:pkts=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:pkts:AVERAGE",
-               "DEF:dropped=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:dropped:AVERAGE",
-               "DEF:overlimits=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:overlimits:AVERAGE",
-               "AREA:pkts$color:packets",
-               "GPRINT:pkts:LAST:total packets\\:%8.3lf %s packets\\j",
-               "LINE3:dropped#FF0000:dropped",
-               "GPRINT:dropped:LAST:dropped packets\\:%8.3lf %s packets\\j",
-               "LINE3:overlimits#0000FF:overlimits",
-               "GPRINT:overlimits:LAST:overlimits\\:%8.3lf %s packets\\j",
-       );
-       $ERROR = RRDs::error;
-       #print "$ERROR";
-}
-
 sub overviewgraph {
        $qossettings{'DEV'} = shift;
        if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { 
@@ -1572,7 +1461,7 @@ sub overviewgraph {
        }
        RRDs::graph (@command);
        $ERROR = RRDs::error;
-       #print "$ERROR";
+       print "$ERROR";
 }
 
 sub random_hex_color {