/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified: xChaos, 20080422\r
- ludva, 20080415\r
+/* Modified by: xChaos, 20080728\r
+ ludva, 20080415\r
\r
Prometheus QoS is free software; you can redistribute it and/or\r
modify it under the terms of the GNU General Public License as \r
\r
#include "cll1-0.6.h"\r
\r
-const char *version="0.7.9-c"; \r
+const char *version = "0.7.9-d"; \r
\r
-/* Version numbers: 0.7.9 will be last development ("beta"), 0.8.0 first stable */\r
+/* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */\r
/* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
/* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */\r
/* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */\r
\r
+const char *stats_html_signature = "<small>Statistics generated by Prometheus QoS version %s<br>GPL+Copyright(C)2005-2008 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></small>\n";\r
+\r
/* ======= All path names are defined here (for RPM patch) ======= */\r
\r
-char *tc = "/sbin/tc"; /* requires tc with HTB support */\r
-char *iptables = "/sbin/iptables"; /* requires iptables utility */\r
-char *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
+char *tc = "/sbin/tc"; /* requires tc with HTB support */\r
+char *iptables = "/sbin/iptables"; /* requires iptables utility */\r
+char *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */\r
-char *ls = "/bin/ls"; /* this is not user configurable :-) */\r
+char *ls = "/bin/ls"; /* this is not user configurable :-) */\r
\r
-char *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
-char *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */\r
+char *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
+char *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */\r
\r
-char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
-char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r
-char *html = "/var/www/traffic.html"; /* hall of fame filename */\r
-char *preview = "/var/www/preview.html"; /* hall of fame preview */\r
-char *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
-char *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
-char *log_url = "logs/"; /* log directory relative URI prefix (partial URL) */\r
-char *html_log_dir = "/var/www/logs/html/";\r
+char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
+char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r
+char *html = "/var/www/traffic.html"; /* hall of fame filename */\r
+char *preview = "/var/www/preview.html"; /* hall of fame preview */\r
+char *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
+char *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
+char *log_url = "logs/"; /* log directory relative URI prefix (partial URL) */\r
+char *html_log_dir = "/var/www/logs/html/";\r
\r
/* ======= Help screen is hopefuly self-documenting part of code :-) ======= */\r
\r
-r just reload configuration (...and keep data transfer statistics)\n\\r
*/\r
}\r
-\r
/* === Configuraration file values defaults - stored in global variables ==== */\r
\r
-int filter_type=1; /*1 mark, 2 classify*/\r
-char *mark="MARK";\r
-char *mark_iptables="MARK --set-mark ";\r
-int dry_run=0; /* preview - use puts() instead of system() */\r
-char *iptablespreamble="*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";\r
-FILE *iptables_file=NULL;\r
-int enable_credit=1; /* enable credit file */\r
-int use_credit=0; /* use credit file (if enabled)*/\r
-char *title="Hall of Fame - Greatest Suckers"; /* hall of fame title */\r
-int hall_of_fame=1; /* enable hall of fame */\r
-char *lan="eth0"; /* LAN interface */\r
-char *lan_medium="100Mbit"; /* 10Mbit/100Mbit ethernet */\r
-char *wan="eth1"; /* WAN/ISP interface */\r
-char *wan_medium="100Mbit"; /* 10Mbit/100Mbit ethernet */\r
-char *qos_leaf="sfq perturb 5"; /* leaf discipline */\r
-char *qos_free_zone=NULL; /* QoS free zone */\r
-int qos_proxy=1; /* include proxy port to QoS */\r
-int include_upload=1; /* upload+download=total traffic */\r
-char *proxy_ip="192.168.1.1/32"; /* our IP with proxy port */\r
-int proxy_port=3128; /* proxy port number */\r
-long long int line=1024; /* WAN/ISP download in kbps */\r
-long long int up=1024; /* WAN/ISP upload in kbps */\r
-int free_min=32; /* minimum guaranted bandwidth for all undefined hosts */\r
-int free_max=64; /* maximum allowed bandwidth for all undefined hosts */\r
-int qos_free_delay=0; /* seconds to sleep before applying new QoS rules */\r
-int digital_divide=2; /* controls digital divide weirdness ratio, 1...3 */ \r
-int max_nesting=3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */\r
-int htb_r2q=1; \r
-int burst=8; /* HTB burst (in kbits) */\r
-int burst_main=64;\r
-int burst_group=32;\r
-int magic_priorities=8; /* number of priority levels (soft shaping) */\r
-int magic_treshold=8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */\r
-int keywordcount=0;\r
-\r
+int filter_type = 1; /*1 mark, 2 classify*/\r
+char *mark = "MARK";\r
+char *mark_iptables = "MARK --set-mark ";\r
+int dry_run = 0; /* preview - use puts() instead of system() */\r
+char *iptablespreamble = "*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";\r
+FILE *iptables_file = NULL;\r
+int enable_credit = 1; /* enable credit file */\r
+int use_credit = 0; /* use credit file (if enabled)*/\r
+char *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */\r
+int hall_of_fame = 1; /* enable hall of fame */\r
+char *lan = "eth0"; /* LAN interface */\r
+char *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
+char *wan = "eth1"; /* WAN/ISP interface */\r
+char *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
+char *qos_leaf = "sfq perturb 5"; /* leaf discipline */\r
+char *qos_free_zone = NULL; /* QoS free zone */\r
+int qos_proxy = 1; /* include proxy port to QoS */\r
+int include_upload = 1; /* upload+download=total traffic */\r
+char *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */\r
+int proxy_port = 3128; /* proxy port number */\r
+long long int line = 1024; /* WAN/ISP download in kbps */\r
+long long int up = 1024; /* WAN/ISP upload in kbps */\r
+int free_min = 32; /* minimum guaranted bandwidth for all undefined hosts */\r
+int free_max = 64; /* maximum allowed bandwidth for all undefined hosts */\r
+int qos_free_delay = 0; /* seconds to sleep before applying new QoS rules */\r
+int digital_divide = 2; /* controls digital divide weirdness ratio, 1...3 */ \r
+int max_nesting = 3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */\r
+int htb_r2q = 1; \r
+int burst = 8; /* HTB burst (in kbits) */\r
+int burst_main = 64;\r
+int burst_group = 32;\r
+int magic_priorities = 8; /* number of priority levels (soft shaping) */\r
+int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */\r
+int keywordcount = 0;\r
/* not yet implemented:\r
- int fixed_packets=0; maximum number of pps per IP address (not class!) \r
- int packet_limit=5; maximum number of pps to htn CEIL, not rate !!! \r
+int fixed_packets = 0; maximum number of pps per IP address (not class!) \r
+int packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! \r
*/\r
-FILE *log_file=NULL;\r
-\r
-char *kwd="via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */\r
+FILE *log_file = NULL;\r
+char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */\r
\r
const int idxtable_treshold1=24; /* this is no longer configurable */\r
const int idxtable_treshold2=12; /* this is no longer configurable */\r
case 7:\r
case 8:\r
case 9:\r
- case 10: if (isalnum(*ptr)) /* alphanumeric string = date, just one*/\r
+ case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
{\r
valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
{\r
f=fopen(str,"w");\r
if(f)\r
{\r
- fprintf(f,"<table border><tr><th colspan=\"4\">Data transfers - %s %s</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);\r
+ fprintf(f,"<table border><tr><th colspan=\"2\">%s %s</th><th colspan=\"2\">Data transfers</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);\r
every(iplog,iplogs)\r
if(iplog->traffic)\r
{\r
- fprintf(f,"<tr><td align=\"right\">%d</td><th>%s</td><td align=\"right\">%ld MB</td><th align=\"right\">%ld GB</th><th align=\"right\">%ld kbps</th></tr>\n",\r
+ fprintf(f,"<tr><td align=\"right\">%d</td><th align=\"left\">%s</td><td align=\"right\">%ld MB</td><th align=\"right\">%ld GB</th><td align=\"right\">%ld kbps</th></tr>\n",\r
i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted);\r
total+=iplog->traffic>>10;\r
}\r
fprintf(f,"<tr><th colspan=\"3\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th><th align=\"right\">%Ld kbps</th></tr>\n", total, line);\r
- fputs("</table>\n",f);\r
+ fputs("</table>\n", f);\r
+ fprintf(f, stats_html_signature, version);\r
fclose(f);\r
puts(" done.");\r
}\r
printf("\n\\r
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\\r
Version %s - Copyright (C)2005-2008 Michael Polak (xChaos)\n\\r
-iptables-restore & burst tunning & classify modification 0.7d by Ludva\n\\r
+iptables-restore & burst tunning & classify modification by Ludva\n\\r
Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);\r
\r
/*----- Boring... we have to check command line options first: ----*/\r
\r
fprintf(f,"<tr><td>All users, all traffic</td>\n");\r
fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%Lu M</th><th align=\"right\">100 %%</th></tr>\n",active_classes,total);\r
- fputs("</table>\n",f);\r
+ fputs("</table>\n", f);\r
}\r
- fprintf(f,"<small>Statistics generated by Prometheus QoS version %s<br>GPL+Copyright(C)2005-2008 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></small>\n",version);\r
+ fprintf(f, stats_html_signature, version);\r
fclose(f);\r
}\r
\r
sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
safe_run(str);\r
\r
- if (strcmpi(ip->keyword->leaf_discipline, "none")){\r
- sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
- safe_run(str);\r
- }\r
- \r
- if (filter_type == 1){\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark);\r
- safe_run(str);\r
+ if (strcmpi(ip->keyword->leaf_discipline, "none"))\r
+ {\r
+ sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
+ safe_run(str);\r
+ } \r
+ if (filter_type == 1)\r
+ {\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark);\r
+ safe_run(str);\r
}\r
\r
/* -------------------------------------------------------- upload class */\r
(int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
safe_run(str);\r
\r
- if (strcmpi(ip->keyword->leaf_discipline, "none")){\r
- sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s",tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
- safe_run(str);\r
- }\r
- \r
- if (filter_type == 1){\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark);\r
- safe_run(str);\r
+ if (strcmpi(ip->keyword->leaf_discipline, "none"))\r
+ {\r
+ sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s",tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
+ safe_run(str);\r
+ } \r
+ if (filter_type == 1)\r
+ {\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark);\r
+ safe_run(str);\r
}\r
}\r
else\r
i++;\r
}\r
\r
-\r
if(idxs)\r
{\r
- chain_forward="forw_common";\r
- chain_postrouting="post_common";\r
+ chain_forward = "forw_common";\r
+ chain_postrouting = "post_common";\r
}\r
else\r
{\r
- chain_forward="FORWARD";\r
- chain_postrouting="POSTROUTING";\r
+ chain_forward = "FORWARD";\r
+ chain_postrouting = "POSTROUTING";\r
}\r
-\r
- /* -------------------------------------------------------- mark download */\r
-\r
- if(qos_proxy)\r
+ /* -------------------------------- classify or reject free download */\r
{\r
- sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3);\r
- save_line(str);\r
- sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j ACCEPT",chain_postrouting,proxy_ip,proxy_port,lan);\r
- save_line(str);\r
+ char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\r
+ if(free_min) final_chain = "ACCEPT";\r
+ if(qos_proxy)\r
+ {\r
+ if(free_min)\r
+ {\r
+ sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3);\r
+ save_line(str);\r
+ }\r
+ sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r
+ save_line(str);\r
+ }\r
+ if(free_min)\r
+ {\r
+ sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3);\r
+ save_line(str);\r
+ }\r
+ sprintf(str,"-A %s -o %s -j %s",chain_postrouting,lan,final_chain);\r
+ save_line(str);\r
+ /* ------------------------------- classify or reject free upload */\r
+ if(free_min)\r
+ {\r
+ sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3);\r
+ save_line(str);\r
+ }\r
+ sprintf(str,"-A %s -o %s -j %s",chain_forward,wan,final_chain);\r
+ save_line(str);\r
}\r
- sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3);\r
- save_line(str);\r
- sprintf(str,"-A %s -o %s -j ACCEPT",chain_postrouting,lan);\r
- save_line(str);\r
\r
- /* -------------------------------------------------------- mark upload */\r
- sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3);\r
- save_line(str);\r
- sprintf(str,"-A %s -o %s -j ACCEPT",chain_forward,wan);\r
- save_line(str);\r
-\r
- printf("Total IP count: %d\n", i);\r
-\r
- /*-----------------------------------------------------------------*/\r
- puts("Generating free bandwith classes ...");\r
- /*-----------------------------------------------------------------*/\r
-\r
- /* ---------------------------------------- tc - free bandwith shared class */\r
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,lan,parent,free_min,free_max,burst);\r
- safe_run(str);\r
-\r
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,wan,parent,free_min,free_max,burst);\r
- safe_run(str);\r
+ if(free_min) /* allocate free bandwith if it is not zero... */ \r
+ {\r
+ /*-----------------------------------------------------------------*/\r
+ puts("Generating free bandwith classes ...");\r
+ /*-----------------------------------------------------------------*/\r
+ sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,lan,parent,free_min,free_max,burst);\r
+ safe_run(str);\r
+ sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,wan,parent,free_min,free_max,burst);\r
+ safe_run(str);\r
+ /* tc SFQ */\r
+ if (strcmpi(qos_leaf, "none"))\r
+ {\r
+ sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf);\r
+ safe_run(str);\r
+ \r
+ sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf);\r
+ safe_run(str);\r
+ } \r
+ /* tc handle 1 fw flowid */\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,lan);\r
+ safe_run(str);\r
\r
- /* tc SFQ */\r
- if (strcmpi(qos_leaf, "none")){\r
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf);\r
- safe_run(str);\r
- \r
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf);\r
- safe_run(str);\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
+ safe_run(str);\r
}\r
- \r
- /* tc handle 1 fw flowid */\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,lan);\r
- safe_run(str);\r
-\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
- safe_run(str);\r
-\r
- run_restore();\r
- \r
+ printf("Total IP count: %d\n", i);\r
+ run_restore(); \r
if (log_file) fclose(log_file);\r
return 0;\r
-\r
/* that's all folks, thank you for reading it all the way up to this point ;-) */\r
/* bad luck C<<1 is not yet finished, I promise no sprintf() next time... */\r
}\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff