From cfd19520d7deb11bee161f2ba7a64e772150e175 Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 11 Sep 2006 13:46:05 +0000 Subject: [PATCH] QoS-Improvements. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@269 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/ChangeLog | 8 ++++++++ html/cgi-bin/qos.cgi | 8 ++++---- src/misc-progs/qosctrl.c | 6 ++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index d71007fed6..76aec76988 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +------------------------------------------------------------------------ +r268 | ms | 2006-09-10 21:52:20 +0200 (Sun, 10 Sep 2006) | 5 lines + +Geaendert: + * Squid auf neuesten Stand gebracht. + * QoS-Fortschritt. + * Kleines Script fuer Sprachdateiupdates. + ------------------------------------------------------------------------ r267 | ms | 2006-09-02 22:18:51 +0200 (Sat, 02 Sep 2006) | 4 lines diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 0b40b4930b..94e63b2c82 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -323,9 +323,9 @@ END if ($qossettings{'ACTION'} eq 'Start') { - system("sleep 1 && /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh &"); + system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); system("/bin/touch /var/ipfire/qos/enable"); - system("sleep 2 && /usr/local/bin/qosctrl start >/dev/null 2>&1"); + 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); @@ -343,8 +343,8 @@ elsif ($qossettings{'ACTION'} eq 'Neustart') { if ($qossettings{'ENABLED'} eq 'on'){ system("/usr/local/bin/qosctrl stop >/dev/null 2>&1"); - system("sleep 1 && /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh &"); - system("sleep 5 && /usr/local/bin/qosctrl start >/dev/null 2>&1"); + system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); + system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); system("logger -t ipfire 'QoS restarted'"); } } diff --git a/src/misc-progs/qosctrl.c b/src/misc-progs/qosctrl.c index f5faaa7a08..37cfab6405 100644 --- a/src/misc-progs/qosctrl.c +++ b/src/misc-progs/qosctrl.c @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) { exit(1); if (argc < 2) { - fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status)\n\n"); + fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n"); exit(1); } @@ -43,8 +43,10 @@ int main(int argc, char *argv[]) { 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 if (strcmp(argv[1], "generate") == 0) { + safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh 2>/dev/null"); } else { - fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status)\n\n"); + fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n"); exit(1); } -- 2.39.2