}
foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry );
- $qossettings{'DEVICE'} = $subclassline[0];
- $qossettings{'CLASS'} = $subclassline[1];
- $qossettings{'SCLASS'} = $subclassline[2];
- $qossettings{'SPRIO'} = $subclassline[3];
- $qossettings{'SRATE'} = $subclassline[4];
- $qossettings{'SCEIL'} = $subclassline[5];
- $qossettings{'SBURST'} = $subclassline[6];
- $qossettings{'SCBURST'} = $subclassline[7];
- print "\ttc class add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} classid 1:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
- if ($qossettings{'SBURST'} > 0) {
- print "burst $qossettings{'SBURST'}k ";
- }
- if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
- print "cburst $qossettings{'CBURST'}k";
+ if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
+ $qossettings{'DEVICE'} = $subclassline[0];
+ $qossettings{'CLASS'} = $subclassline[1];
+ $qossettings{'SCLASS'} = $subclassline[2];
+ $qossettings{'SPRIO'} = $subclassline[3];
+ $qossettings{'SRATE'} = $subclassline[4];
+ $qossettings{'SCEIL'} = $subclassline[5];
+ $qossettings{'SBURST'} = $subclassline[6];
+ $qossettings{'SCBURST'} = $subclassline[7];
+ print "\ttc class add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} classid 1:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
+ if ($qossettings{'SBURST'} > 0) {
+ print "burst $qossettings{'SBURST'}k ";
+ }
+ if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
+ print "cburst $qossettings{'CBURST'}k";
+ }
+ print "\n";
}
- print "\n";
}
print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2];
- print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 1:$qossettings{'SCLASS'}\n";
+ print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 1:$qossettings{'SCLASS'}\n";
}
}
print <<END
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2];
- print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
+ print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
}
}
print <<END
############################################################################################################################
############################################################################################################################
-
------------------------------------------------------------------------
+r252 | ms | 2006-08-19 22:26:47 +0200 (Sat, 19 Aug 2006) | 2 lines
+
+Geaendert:
+ * LibPNG-Files-Fix
+------------------------------------------------------------------------
r251 | ms | 2006-08-19 20:09:18 +0200 (Sat, 19 Aug 2006) | 5 lines
Programmupdate:
}
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
}
+elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
+{
+ &Header::openbox('100%', 'left', 'QoS Status');
+ if ($qossettings{'ENABLED'} eq 'on'){
+ my $output = "";
+ $output = `/usr/local/bin/qosctrl status`;
+ $output = &Header::cleanhtml($output,"y");
+ print "<pre>$output</pre>\n";
+ } else { print "QoS ist nicht aktiviert!"; }
+ &Header::closebox();
+ &Header::closebigbox();
+ &Header::closepage();
+ exit
+}
elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
{
&parentclass();
<tr><td width='40%' align='right'>Uploadstandardklasse: <td width='40%' align='left'>$qossettings{'DEFCLASS_OUT'}
<tr><td width='40%' align='right'>ACKs: <td width='40%' align='left'>$qossettings{'ACK'}
<tr><td colspan='3' width='100%'><hr>
- <tr><td colspan='3' width='100%' align='center'><input type='submit' name='ACTION' value='Parentklasse hinzufuegen'><input type='submit' name='ACTION' value='Erweiterte Einstellungen'>
+ <tr><td colspan='3' width='100%' align='center'><input type='submit' name='ACTION' value='Parentklasse hinzufuegen'><input type='submit' name='ACTION' value='Erweiterte Einstellungen'><input type='submit' name='ACTION' value='Statusinformationen'>
</form>
END
;
fi
echo "### MAKING SOURCES-ISO"
- $0 sources-iso
+ echo "DISABLED by Delaco!"
+ #$0 sources-iso
echo "### UPLOADING ISO"
$0 upload iso
#usr/lib/libpng.la
usr/lib/libpng.so
#usr/lib/libpng12.la
-#usr/lib/libpng12.so
-#usr/lib/libpng12.so.0
-#usr/lib/libpng12.so.0.12.0
+usr/lib/libpng12.so
+usr/lib/libpng12.so.0
+usr/lib/libpng12.so.0.12.0
#usr/lib/pkgconfig/libpng.pc
#usr/lib/pkgconfig/libpng12.pc
#usr/share/man/man3/libpng.3
usr/local/bin/launch-ether-wake
usr/local/bin/logwatch
usr/local/bin/openvpnctrl
+usr/local/bin/qosctrl
usr/local/bin/rebuildhosts
usr/local/bin/restartdhcp
usr/local/bin/restartntpd
exit(1);
if (argc < 2) {
- fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|clear|status)\n\n");
+ fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status)\n\n");
exit(1);
}
{
safe_system("/var/ipfire/qos/bin/qos.sh start");
}
- } else if (strcmp(argv[1], "clear") == 0) {
+ } else if (strcmp(argv[1], "stop") == 0) {
safe_system("/var/ipfire/qos/bin/qos.sh clear");
} else if (strcmp(argv[1], "status") == 0) {
safe_system("/var/ipfire/qos/bin/qos.sh status");
+ } else if (strcmp(argv[1], "restart") == 0) {
+ safe_system("/var/ipfire/qos/bin/qos.sh restart");
} else {
- fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|clear|status)\n\n");
+ fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status)\n\n");
exit(1);
}
+usr/bin/ncftp
+usr/bin/ncftpbatch
+usr/bin/ncftpbookmarks
+usr/bin/ncftpget
+usr/bin/ncftpls
+usr/bin/ncftpput
+usr/bin/ncftpspooler
+#usr/include/ncftp.h
+#usr/include/ncftp_errno.h
+usr/lib/libncftp.so
+usr/lib/libncftp.so.2
+#usr/share/man/man1/ncftp.1
+#usr/share/man/man1/ncftpbatch.1
+#usr/share/man/man1/ncftpget.1
+#usr/share/man/man1/ncftpls.1
+#usr/share/man/man1/ncftpput.1
+#usr/share/man/man1/ncftpspooler.1
cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES
- cd /install/packages && md5sum $PROG*.tar.gz > $PROG-$VER-$PAK_VER.tar.gz.md5
+ cd /install/packages && md5sum $PROG*.tar.gz > $PROG-${VER}_$PAK_VER.tar.gz.md5
cd /install/packages && md5sum $PROG*.tar.gz >> all-progs.md5
rm -rf /install/packages/package
exit 0