/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-/* Prometheus QoS - you can "steal fire" from your ISP *//* "fair-per-IP" quality of service (QoS) utility */\r
+/* Prometheus QoS - you can "steal fire" from your ISP */\r
+/* "fair-per-IP" quality of service (QoS) utility */\r
/* requires Linux 2.4.x or 2.6.x with HTB support */\r
/* Copyright(C) 2005-2013 Michael Polak, Arachne Aerospace */\r
/* iptables-restore support Copyright(C) 2007-2008 ludva */\r
/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified by: xChaos, 20130124\r
+/* Modified by: xChaos, 20131119\r
ludva, 20080415\r
\r
Prometheus QoS is free software; you can redistribute it and/or\r
#include "cll1-0.6.2.h"\r
#include "ipstruct.h"\r
\r
-const char *version = "0.8.3-i";\r
+const char *version = "0.8.3-j";\r
\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
/* Versions: 0.8.3 is development release, 0.8.4 will be "stable" */\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 = TRUE; /* include proxy port to QoS */\r
+/* int qos_proxy = TRUE; include proxy port to QoS */\r
int found_lmsid = FALSE; /* show links to users in LMS information system */\r
int include_upload = TRUE; /* 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
+/* 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 = 256; /* minimum guaranted bandwidth for all undefined hosts */\r
int keywordcount = 0;\r
int class_count = 0;\r
int ip_count = 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
-*/\r
FILE *log_file = NULL;\r
char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */\r
\r
const int idxtable_bitmask1 = 3; /* this is no longer configurable */\r
const int idxtable_bitmask2 = 3; /* this is no longer configurable */\r
\r
-struct IP *ips = NULL, *ip, *sharedip;\r
+struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;\r
struct Group *groups = NULL, *group;\r
struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;\r
\r
+#define FREE_CLASS 3\r
+#define OVERLIMIT_CLASS 4\r
+\r
void help(void);\r
/* implemented in help.c */
\r
void write_htmlandlogs(char *html, char *d, int total, int just_preview);\r
/* implemented in htmlandlogs.c */\r
\r
+void analyse_topology(char *traceroute);\r
+/* implemented in networks.c */\r
+\r
+\r
const char *tr_odd_even(void)\r
{\r
row_odd_even = 1 - row_odd_even;\r
ioption("use-jquery-popups",use_jquery_popups);\r
option("qos-free-zone",qos_free_zone);\r
ioption("qos-free-delay",qos_free_delay);\r
- ioption("qos-proxy-enable",qos_proxy);\r
- option("qos-proxy-ip",proxy_ip);\r
+/* ioption("qos-proxy-enable",qos_proxy); */\r
+/* option("qos-proxy-ip",proxy_ip);*/\r
option("htb-leaf-discipline",qos_leaf);\r
- ioption("qos-proxy-port",proxy_port);\r
+/* ioption("qos-proxy-port",proxy_port); */\r
ioption("free-rate",free_min);\r
ioption("free-ceil",free_max);\r
ioption("htb-burst",burst);\r
/* leaf discipline for keywords */\r
for_each(keyword,keywords)\r
{\r
- if(!strcmpi(keyword->leaf_discipline, ""))\r
- {\r
- keyword->leaf_discipline = qos_leaf;\r
- }\r
+ if(!strcmpi(keyword->leaf_discipline, ""))\r
+ {\r
+ keyword->leaf_discipline = qos_leaf;\r
+ }\r
}\r
\r
if(strcmpi(cnf, "mark"))\r
int i=0; /* just plain old Fortran style integer :-) */\r
FILE *f=NULL; /* everything is just stream of bytes... */\r
char *str, *ptr, *d; /* LET A$=B$ :-) */\r
- char *substring;\r
+ char *substring, *limit_pkts;\r
\r
int parent = 1;\r
+ int just_networks = FALSE; \r
int just_flush = FALSE; /* deactivates all previous actions */\r
int nodelay = FALSE;\r
int just_preview = FALSE; /* preview - generate just stats */\r
int start_shaping = FALSE; /* apply FUP - requires classmap file */\r
+ int stop_shaping = FALSE; /* lift FUP - requires classmap file */\r
+ int reduce_ceil = 0; /* allow only rate+(ceil-rate)/2, /4, etc. */\r
int just_logs = FALSE; /* just parse logs */\r
int run = FALSE;\r
int total = 0;\r
argument("-f") { run=TRUE; just_flush=TRUE; }\r
argument("-9") { run=TRUE; just_flush=9; }\r
argument("-p") { run=TRUE; just_preview=TRUE; }\r
+ argument("-q") { run=TRUE; just_preview=TRUE; stop_shaping=TRUE; }\r
+ argument("-2") { run=TRUE; just_preview=TRUE; reduce_ceil=2; }\r
+ argument("-4") { run=TRUE; just_preview=TRUE; reduce_ceil=4; }\r
argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; }\r
argument("-r") { run=TRUE; }\r
argument("-n") { run=TRUE; nodelay=TRUE; }\r
+ argument("-a") { run=TRUE; just_networks=TRUE; }\r
argument("-l") { just_logs=TRUE; }\r
argument("-m") { just_logs=TRUE; }\r
argument("-y") { just_logs=TRUE; }\r
\r
if(althosts)\r
{\r
- hosts=althosts;\r
+ hosts = althosts;\r
}\r
\r
if(just_flush<9)\r
}\r
\r
/*-----------------------------------------------------------------*/\r
- printf("Parsing class defintion file %s ...\n", hosts);\r
+ /* cll1.h - let's allocate brand new character buffer... */\r
/*-----------------------------------------------------------------*/\r
- parse_hosts(hosts);\r
+ string(str, STRLEN); \r
+ string(limit_pkts, STRLEN);\r
\r
/*-----------------------------------------------------------------*/\r
- /* cll1.h - let's allocate brand new character buffer... */\r
+ printf("Parsing class defintion file %s ...\n", hosts);\r
/*-----------------------------------------------------------------*/\r
- string(str,STRLEN); \r
+ parse_hosts(hosts);\r
+ if(just_networks)\r
+ {\r
+ analyse_topology("/usr/sbin/traceroute -n -m 10 -w 2 %s.%d");\r
+ exit(-1); \r
+ }\r
\r
/*-----------------------------------------------------------------*/\r
puts("Resolving shared connections ...");\r
/*-----------------------------------------------------------------*/\r
- for_each(ip,ips) if(ip->sharing)\r
+ for_each(ip, ips) if(ip->sharing)\r
{\r
- for_each(sharedip,ips) if(eq(sharedip->name,ip->sharing))\r
+ for_each(sharedip, ips) if(eq(sharedip->name, ip->sharing))\r
{\r
- sharedip->traffic+=ip->traffic;\r
- ip->traffic=0;\r
- ip->mark=sharedip->mark; \r
- ip->lmsid=sharedip->lmsid;\r
+ sharedip->traffic += ip->traffic;\r
+ ip->traffic = 0;\r
+ ip->mark = sharedip->mark; \r
+ ip->lmsid = sharedip->lmsid;\r
+ ip->pps_limit = sharedip->pps_limit; /* no other way to do this */\r
break;\r
}\r
if(not sharedip)\r
{\r
perror(cmdlog);\r
exit(-1);\r
- }\r
- \r
+ } \r
\r
sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);\r
safe_run(str);\r
sprintf(str,"-A FORWARD -d %s -o %s -j ACCEPT", qos_free_zone, wan);\r
iptables_save_line(str, FALSE); /* this is currently supported only for IPv4 */\r
\r
+/*\r
if(qos_proxy)\r
{\r
iptables_save_line(":post_noproxy - [0:0]", FALSE);\r
\r
chain="post_noproxy"; \r
}\r
+\r
else\r
{\r
- chain="POSTROUTING";\r
- }\r
+*/\r
+ chain = "POSTROUTING";\r
+// }\r
\r
sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);\r
iptables_save_line(str, FALSE);\r
\r
if(just_preview)\r
{\r
- if(start_shaping)\r
+ if(start_shaping || stop_shaping || reduce_ceil)\r
{\r
printf("Reading %s and applying Fair Use Policy rules ... \n", classmap);\r
parse(classmap)\r
if_exists(ip,ips,eq(ip->addr,_))\r
{\r
ip->mark=atoi(ptr);\r
- if(ip->max < ip->desired) /* apply FUP limit immediately.... */\r
+ if(ip->max < ip->desired || stop_shaping || reduce_ceil) /* apply or disable FUP limit immediately.... */\r
{\r
- printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+ if(stop_shaping)\r
+ {\r
+ ip->max = ip->desired;\r
+ printf("Removing limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+ }\r
+ else\r
+ {\r
+ printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);\r
+ if(reduce_ceil)\r
+ {\r
+ ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;\r
+ }\r
+ }\r
printf("(down: %dk-%dk ", ip->min, ip->max); \r
sprintf(str, "%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
perror(classmap);\r
puts("Warning - classmap file not fund, just generating preview ...");\r
start_shaping=FALSE;\r
+ stop_shaping=FALSE;\r
}\r
done; /* ugly macro end */\r
}\r
{\r
swchar='s';\r
}\r
+ else if(reduce_ceil)\r
+ {\r
+ swchar='0'+reduce_ceil; /* -2, -4 */\r
+ }\r
+ else if(stop_shaping)\r
+ {\r
+ swchar='q';\r
+ }\r
+\r
printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);\r
exit(0);\r
} \r
chain_postrouting="POSTROUTING";\r
}\r
\r
+ /* packet limits - this will be optional in future */\r
+ if(ip->pps_limit)\r
+ {\r
+ sprintf(limit_pkts, "-m limit --limit %d/s --limit-burst %d ", \r
+ ip->pps_limit, ip->pps_limit);\r
+ }\r
+ else\r
+ {\r
+ *limit_pkts = 0;\r
+ } \r
+\r
#ifdef DEBUG\r
- printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+ printf("%-22s %-16s %04d %d/s\n", ip->name, ip->addr, ip->mark, ip->pps_limit); \r
#endif\r
\r
- /* -------------------------------------------------------- mark download */\r
- \r
+ /* -------------------------------------------------------- mark download */ \r
sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
- chain_postrouting, ip->addr, 32*(1+ip->v6), lan, mark_iptables, ip->mark);\r
- /* -m limit --limit 1/s */ \r
+ chain_postrouting, ip->addr, 32*(1+ip->v6),\r
+ lan, mark_iptables, ip->mark);\r
iptables_save_line(str, ip->v6);\r
\r
+/*\r
if(qos_proxy)\r
{\r
sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/%d -o %s -j %s%d",\r
- chain_postrouting, proxy_ip, proxy_port, ip->addr, 32*(1+ip->v6), lan, mark_iptables, ip->mark);\r
+ chain_postrouting, proxy_ip, proxy_port, ip->addr,\r
+ 32*(1+ip->v6), lan, mark_iptables, ip->mark);\r
iptables_save_line(str, ip->v6);\r
}\r
+*/\r
+ sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",\r
+ chain_postrouting, ip->addr, 32*(1+ip->v6), lan, limit_pkts);\r
+ iptables_save_line(str, ip->v6);\r
+\r
+ /* classify overlimit packets to separate overlimit class */\r
+ sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
+ chain_postrouting, ip->addr, 32*(1+ip->v6),\r
+ lan, mark_iptables, OVERLIMIT_CLASS);\r
+ iptables_save_line(str, ip->v6);\r
\r
sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",\r
chain_postrouting, ip->addr, 32*(1+ip->v6), lan);\r
chain_forward, ip->addr, 32*(1+ip->v6), wan, mark_iptables, ip->mark);\r
iptables_save_line(str, ip->v6);\r
\r
+ sprintf(str, "-A %s -s %s/%d -o %s %s-j ACCEPT",\r
+ chain_forward, ip->addr, 32*(1+ip->v6), wan, limit_pkts);\r
+ iptables_save_line(str, ip->v6);\r
+\r
+ /* classify overlimit packets to separate overlimit class */\r
+ sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", \r
+ chain_forward, ip->addr, 32*(1+ip->v6), wan, mark_iptables, OVERLIMIT_CLASS);\r
+ iptables_save_line(str, ip->v6);\r
+\r
sprintf(str, "-A %s -s %s/%d -o %s -j ACCEPT",\r
chain_forward, ip->addr, 32*(1+ip->v6), wan);\r
iptables_save_line(str, ip->v6);\r
#endif\r
\r
sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
- tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
+ 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
final_chain = "ACCEPT";\r
}\r
\r
+/*\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",\r
chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables, 3);\r
- iptables_save_line(str, FALSE); /* only for IPv4 */\r
+ iptables_save_line(str, FALSE); // only for IPv4\r
}\r
sprintf(str, "-A %s -s %s -p tcp --sport %d -o %s -j %s",\r
chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r
- iptables_save_line(str, FALSE); /* only for IPv4 */\r
+ iptables_save_line(str, FALSE); // only for IPv4\r
}\r
+*/\r
\r
if(free_min)\r
{\r
sprintf(str, "-A %s -o %s -j %s%d",\r
- chain_postrouting, lan, mark_iptables, 3);\r
+ chain_postrouting, lan, mark_iptables, FREE_CLASS);\r
iptables_save_line(str, FALSE); /* only for IPv4 */\r
}\r
\r
\r
if(free_min)\r
{\r
- sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);\r
+ sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, FREE_CLASS);\r
iptables_save_line(str, FALSE); /* only for IPv4 */\r
}\r
\r
if(free_min) /* allocate free bandwith if it is not zero... */ \r
{\r
/*-----------------------------------------------------------------*/\r
- puts("Generating free bandwith classes ...");\r
+ puts("Generating free bandwith class ...");\r
/*-----------------------------------------------------------------*/\r
- sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
- tc, lan, parent, free_min, free_max,burst, lowest_priority);\r
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+ tc, lan, parent, FREE_CLASS, free_min, free_max,burst, lowest_priority);\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 %d",\r
- tc, wan, parent, free_min, free_max, burst, lowest_priority);\r
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+ tc, wan, parent, FREE_CLASS, free_min, free_max, burst, lowest_priority);\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
+ sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, FREE_CLASS, FREE_CLASS, 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
+ sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, wan, FREE_CLASS, FREE_CLASS, 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
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, FREE_CLASS, FREE_CLASS);\r
+ safe_run(str);\r
+\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, wan, FREE_CLASS, FREE_CLASS);\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
+ /*-----------------------------------------------------------------*/\r
+ puts("Generating bandwith class for overlimit packets...");\r
+ /*-----------------------------------------------------------------*/\r
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+ tc, lan, parent, OVERLIMIT_CLASS, 1024, 4096, burst, lowest_priority);\r
+ safe_run(str);\r
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+ tc, wan, parent, OVERLIMIT_CLASS, 1024, 4096, burst, lowest_priority);\r
safe_run(str);\r
}\r
printf("Total IP count: %d\n", i);\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff