webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes:

Browse Source 
* libPNG12 fehlte für makegraphs
  * md5sums erhielten den falschen Namen (ohne Unterstrich)
Geändert:
  * QoS leicht erweitert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@253 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-08-20 20:12:57 +00:00
parent d79b46cbb4
commit 92b5fba450
8 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
config/qos/makeqosscripts.pl
View File

@@ -169,22 +169,24 @@ foreach $classentry (sort @classes)
} }
foreach $subclassentry (sort @subclasses) { foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry ); @subclassline = split( /\;/, $subclassentry );
$qossettings{'DEVICE'} = $subclassline[0]; if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
$qossettings{'CLASS'} = $subclassline[1]; $qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'SCLASS'} = $subclassline[2]; $qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SPRIO'} = $subclassline[3]; $qossettings{'SCLASS'} = $subclassline[2];
$qossettings{'SRATE'} = $subclassline[4]; $qossettings{'SPRIO'} = $subclassline[3];
$qossettings{'SCEIL'} = $subclassline[5]; $qossettings{'SRATE'} = $subclassline[4];
$qossettings{'SBURST'} = $subclassline[6]; $qossettings{'SCEIL'} = $subclassline[5];
$qossettings{'SCBURST'} = $subclassline[7]; $qossettings{'SBURST'} = $subclassline[6];
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'} "; $qossettings{'SCBURST'} = $subclassline[7];
if ($qossettings{'SBURST'} > 0) { 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'} ";
print "burst $qossettings{'SBURST'}k "; if ($qossettings{'SBURST'} > 0) {
print "burst $qossettings{'SBURST'}k ";
}
if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
print "cburst $qossettings{'CBURST'}k";
}
print "\n";
} }
if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
print "cburst $qossettings{'CBURST'}k";
}
print "\n";
} }
print "\n\t### ATTACH QDISC TO LEAF CLASSES\n"; print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
@@ -221,7 +223,7 @@ foreach $subclassentry (sort @subclasses) {
$qossettings{'DEVICE'} = $subclassline[0]; $qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1]; $qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2]; $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 print <<END
@@ -453,7 +455,7 @@ foreach $subclassentry (sort @subclasses) {
$qossettings{'DEVICE'} = $subclassline[0]; $qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1]; $qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2]; $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 print <<END
@@ -593,4 +595,3 @@ END
############################################################################################################################ ############################################################################################################################
############################################################################################################################ ############################################################################################################################

5
doc/ChangeLog
View File

@@ -1,4 +1,9 @@
------------------------------------------------------------------------ ------------------------------------------------------------------------
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 r251 | ms | 2006-08-19 20:09:18 +0200 (Sat, 19 Aug 2006) | 5 lines
Programmupdate: Programmupdate:

16
html/cgi-bin/qos.cgi
View File

@@ -352,6 +352,20 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
} }
&General::writehash("${General::swroot}/qos/settings", \%qossettings); &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') elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
{ {
&parentclass(); &parentclass();
@@ -460,7 +474,7 @@ END
<tr><td width='40%' align='right'>Uploadstandardklasse: <td width='40%' align='left'>$qossettings{'DEFCLASS_OUT'} <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 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%'><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> </form>
END END
; ;

3
make.sh
View File

@@ -1558,7 +1558,8 @@ unattended)
fi fi
echo "### MAKING SOURCES-ISO" echo "### MAKING SOURCES-ISO"
$0 sources-iso echo "DISABLED by Delaco!"
#$0 sources-iso
echo "### UPLOADING ISO" echo "### UPLOADING ISO"
$0 upload iso $0 upload iso

7
src/ROOTFILES.i386
View File

@@ -19612,9 +19612,9 @@ usr/lib/libpcap.so.0.8
#usr/lib/libpng.la #usr/lib/libpng.la
usr/lib/libpng.so usr/lib/libpng.so
#usr/lib/libpng12.la #usr/lib/libpng12.la
#usr/lib/libpng12.so usr/lib/libpng12.so
#usr/lib/libpng12.so.0 usr/lib/libpng12.so.0
#usr/lib/libpng12.so.0.12.0 usr/lib/libpng12.so.0.12.0
#usr/lib/pkgconfig/libpng.pc #usr/lib/pkgconfig/libpng.pc
#usr/lib/pkgconfig/libpng12.pc #usr/lib/pkgconfig/libpng12.pc
#usr/share/man/man3/libpng.3 #usr/share/man/man3/libpng.3
@@ -22575,6 +22575,7 @@ usr/local/bin/ipsecctrl
usr/local/bin/launch-ether-wake usr/local/bin/launch-ether-wake
usr/local/bin/logwatch usr/local/bin/logwatch
usr/local/bin/openvpnctrl usr/local/bin/openvpnctrl
usr/local/bin/qosctrl
usr/local/bin/rebuildhosts usr/local/bin/rebuildhosts
usr/local/bin/restartdhcp usr/local/bin/restartdhcp
usr/local/bin/restartntpd usr/local/bin/restartntpd

8
src/misc-progs/qosctrl.c
View File

@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
exit(1); exit(1);
if (argc < 2) { 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); exit(1);
} }
@@ -38,12 +38,14 @@ int main(int argc, char *argv[]) {
{ {
safe_system("/var/ipfire/qos/bin/qos.sh start"); 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"); safe_system("/var/ipfire/qos/bin/qos.sh clear");
} else if (strcmp(argv[1], "status") == 0) { } else if (strcmp(argv[1], "status") == 0) {
safe_system("/var/ipfire/qos/bin/qos.sh status"); 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 { } 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); exit(1);
} }

17
src/paks/ncftp/ROOTFILES
View File

@@ -0,0 +1,17 @@
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

2
src/scripts/packager
View File

@@ -26,7 +26,7 @@ else
cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh 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 cd /install/packages && md5sum $PROG*.tar.gz >> all-progs.md5
rm -rf /install/packages/package rm -rf /install/packages/package
exit 0 exit 0