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

QoS: Improve saving enabled/disable state

Browse Source 
It was reported that the QoS did not stop when
the user clicked the "stop" button. This patch
fixes that.

Fixes #10664

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
This commit is contained in:
Michael Tremer
2016-01-05 21:00:19 +00:00
parent 9a09d94ee3
commit b0a014b7f8
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/97/filelists/files
View File

@@ -1,4 +1,6 @@
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/qos.cgi
usr/bin/pgrep
usr/local/bin/qosctrl

3
config/rootfiles/core/97/update.sh
View File

@@ -43,6 +43,9 @@ extract_files
# Start services
/etc/init.d/dnsmasq start
# Delete old QoS enabled indicator
rm -f /var/ipfire/qos/enable
# This update need a reboot...
#touch /var/run/need_reboot

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

@@ -463,18 +463,16 @@ if ($qossettings{'ACTION'} eq $Lang::tr{'start'})
$qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
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'");
}
elsif ($qossettings{'ACTION'} eq $Lang::tr{'stop'})
{
system("/usr/local/bin/qosctrl stop >/dev/null 2>&1");
unlink "/var/ipfire/qos/bin/qos.sh";
unlink "/var/ipfire/qos/enable";
system("logger -t ipfire 'QoS stopped'");
$qossettings{'ENABLED'} = 'off';
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
system("/usr/local/bin/qosctrl stop >/dev/null 2>&1");
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
system("logger -t ipfire 'QoS stopped'");
}
elsif ($qossettings{'ACTION'} eq $Lang::tr{'restart'})
{
@@ -587,7 +585,6 @@ END
$qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
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'");
} else {

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

@@ -12,12 +12,14 @@
#include <sys/types.h>
#include <fcntl.h>
#include "setuid.h"
#include "libsmooth.h"
#define QOS_SH "/var/ipfire/qos/bin/qos.sh"
int main(int argc, char *argv[]) {
struct keyvalue* kv = NULL;
int fd = -1;
int r = 0;
if (!(initsetuid()))
exit(1);
@@ -28,14 +30,28 @@ int main(int argc, char *argv[]) {
}
if (strcmp(argv[1], "generate") == 0) {
safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > " QOS_SH);
kv = initkeyvalues();
if (!readkeyvalues(kv, CONFIG_ROOT "/qos/settings")) {
fprintf(stderr, "Cannot read QoS settings\n");
r = 1;
goto END;
}
char enabled[STRING_SIZE];
if (!findkey(kv, "ENABLED", enabled))
strcpy(enabled, "off");
if (strcmp(enabled, "on") == 0)
safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > " QOS_SH);
else
unlink(QOS_SH);
}
if ((fd = open(QOS_SH, O_RDONLY)) != -1) {
close(fd);
} else {
// If there is no qos.sh do nothing.
exit(0);
goto END;
}
safe_system("chmod 755 " QOS_SH " &>/dev/null");
@@ -53,5 +69,9 @@ int main(int argc, char *argv[]) {
exit(1);
}
return 0;
END:
if (kv)
freekeyvalues(kv);
return r;
}