/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified by: xChaos, 20190127\r
+/* Modified by: xChaos, 20190912\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.9.1";\r
+const char *version = "0.9.0-c";\r
\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
/* Versions: 0.9.0 is development release, 1.0 will be "stable" */\r
char *mark = "MARK";\r
char *mark_iptables = "MARK --set-mark ";\r
int dry_run = FALSE; /* preview - use puts() instead of system() */\r
-int mix_new_hosts = FALSE; /* execute only commands not already in log of iptables */\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
char *ip6preamble = "-A FORWARD -p ipv6-icmp -j ACCEPT\n-A POSTROUTING -p ipv6-icmp -j ACCEPT\n-A FORWARD -s fe80::/10 -j ACCEPT\n-A FORWARD -d ff00::/8 -j ACCEPT\n-A POSTROUTING -s fe80::/10 -j ACCEPT\n-A POSTROUTING -d ff00::/8 -j ACCEPT";\r
FILE *iptables_file = NULL;\r
char *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */\r
char *qos_leaf = "sfq perturb 5"; /* leaf discipline */\r
char *qos_free_zone = NULL; /* QoS free zone */\r
+char *qos_free_dst_ipset = NULL; /* QoS free zone - dst match ipset name, must be prepared outside prometheus */\r
+char *qos_free_src_ipset = NULL; /* QoS free zone - src match ipset name, must be prepared outside prometheus */\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
FILE *log_file = NULL;\r
char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */\r
\r
-const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */\r
-const int lowest_priority = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */\r
-const int idxtable_treshold1 = 24; /* this is no longer configurable */\r
-const int idxtable_treshold2 = 12; /* this is no longer configurable */\r
-const int idxtable_bitmask1 = 3; /* this is no longer configurable */\r
-const int idxtable_bitmask2 = 3; /* this is no longer configurable */\r
+const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */\r
+const int lowest_priority = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */\r
+const int idxtable_treshold1 = 24; /* this is no longer configurable */\r
+const int idxtable_treshold2 = 12; /* this is no longer configurable */\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, *networks = NULL, *ip, *sharedip;\r
struct Group *groups = NULL, *group;\r
struct Index *idxs = NULL, *idx, *metaindex;\r
struct Interface *interfaces = NULL, *interface;\r
struct QosFreeInterface *qosfreeinterfaces = NULL, *qosfreeinterface;\r
-struct Textfile *previous_commands = NULL, *previous_iptables = NULL, *previous_ip6tables = NULL, *textline;\r
\r
#define FREE_CLASS 3\r
#define OVERLIMIT_CLASS 4\r
}\r
}\r
\r
+\r
/* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
\r
char *index_id(char *ip, int bitmask);\r
option("lms-url",lms_url);\r
ioption("use-jquery-popups",use_jquery_popups);\r
option("qos-free-zone",qos_free_zone);\r
+ option("qos-free-dst-ipset",qos_free_dst_ipset);\r
+ option("qos-free-src-ipset",qos_free_src_ipset);\r
ioption("qos-free-delay",qos_free_delay);\r
/* ioption("qos-proxy-enable",qos_proxy); */\r
/* option("qos-proxy-ip",proxy_ip);*/\r
}\r
else\r
{\r
- int skip_cmd = FALSE;\r
- if(mix_new_hosts)\r
- for_each(textline, previous_commands)\r
- if(eq(textline->str, cmd))\r
- {\r
- skip_cmd = TRUE;\r
- break;\r
- }\r
- \r
- if(!skip_cmd)\r
- {\r
- if(mix_new_hosts)\r
- {\r
- printf("Executing command: %s\n", cmd);\r
- }\r
- system(cmd);\r
- }\r
+ system(cmd);\r
}\r
if(log_file)\r
{\r
}\r
\r
void iptables_save_line(char *line, int ipv6)\r
-{ \r
+{\r
if(ipv6)\r
{\r
- if(mix_new_hosts)\r
- for_each(textline, previous_ip6tables)\r
- if(eq(textline->str, line))\r
- return;\r
-\r
fprintf(ip6tables_file,"%s\n",line);\r
}\r
else\r
{\r
- if(mix_new_hosts)\r
- for_each(textline, previous_iptables)\r
- if(eq(textline->str, line))\r
- return; \r
-\r
fprintf(iptables_file,"%s\n",line);\r
}\r
- if(mix_new_hosts)\r
- {\r
- printf("Adding iptables/ip6tables rule: %s\n", line);\r
- } \r
}\r
\r
#define IPv4 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 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
\r
printf("\n\\r
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\\r
-Version %s - Copyright (C)2005-2019 Michael Polak, Arachne Labs\n\\r
+Version %s - Copyright (C)2005-2017 Michael Polak, Arachne Labs\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
{\r
argument("-c") { nextargument(config); }\r
argument("-h") { nextargument(althosts);}\r
- argument("-d") { run = TRUE; dry_run = TRUE; }\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("-x") { run = TRUE; just_preview = TRUE; mix_new_hosts = 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
+ argument("-d") { run=TRUE; dry_run=TRUE; }\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
argument("-?") { help(); exit(0); }\r
argument("--help") { help(); exit(0); }\r
argument("-v") { exit(0); } \r
hosts = althosts;\r
}\r
\r
- if(!mix_new_hosts && just_flush<9)\r
+ if(just_flush<9)\r
{\r
/*-----------------------------------------------------------------*/\r
puts("Parsing iptables verbose output ...");\r
}\r
done; /* ugly macro end */\r
\r
+\r
+\r
/*-----------------------------------------------------------------*/\r
printf("Parsing class defintion file %s ...\n", hosts);\r
/*-----------------------------------------------------------------*/\r
}\r
*/\r
\r
- if(mix_new_hosts)\r
- {\r
- char *new_filename;\r
- /*-----------------------------------------------------------------*/\r
- printf("Loading log of previously executed commands %s ...\n", cmdlog);\r
- /*-----------------------------------------------------------------*/\r
- load(textline, previous_commands, cmdlog, Textfile, str);\r
- /*-----------------------------------------------------------------*/\r
- printf("Loading log of iptables-restore commands %s ...\n", iptablesfile);\r
- /*-----------------------------------------------------------------*/\r
- load(textline, previous_iptables, iptablesfile, Textfile, str);\r
- /*-----------------------------------------------------------------*/\r
- printf("Loading log of ip6tables-restore commands %s ...\n", ip6tablesfile);\r
- /*-----------------------------------------------------------------*/\r
- load(textline, previous_ip6tables, ip6tablesfile, Textfile, str);\r
-\r
- string(new_filename, strlen(iptablesfile)+2);\r
- strcpy(new_filename, iptablesfile);\r
- strcat(new_filename, "-x");\r
- iptablesfile = new_filename;\r
-\r
- string(new_filename, strlen(ip6tablesfile)+2);\r
- strcpy(new_filename, ip6tablesfile);\r
- strcat(new_filename, "-x");\r
- ip6tablesfile = new_filename;\r
- }\r
-\r
/*-----------------------------------------------------------------*/\r
puts("Resolving shared connections ...");\r
/*-----------------------------------------------------------------*/\r
}\r
}\r
\r
- if(!mix_new_hosts && enable_credit && just_flush<9)\r
+ if(enable_credit && just_flush<9)\r
{\r
/*-----------------------------------------------------------------*/\r
printf("Parsing credit file %s ...\n", credit);\r
}\r
\r
\r
- if(!mix_new_hosts && !just_preview)\r
+ if(!just_preview)\r
{\r
/*-----------------------------------------------------------------*/\r
puts("Initializing iptables and tc classes ...");\r
iptables_save_line(ip6preamble, IPv6);\r
}\r
\r
- if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */\r
+ if(qos_free_zone && *qos_free_zone != '0') /* this is currently supported only for IPv4 */\r
{\r
for_each(interface, interfaces)\r
{\r
iptables_save_line(str, IPv4);\r
}\r
}\r
+\r
+ if(qos_free_dst_ipset && *qos_free_dst_ipset != '0') /* this is currently supported only for IPv4 */\r
+ {\r
+ for_each(interface, interfaces)\r
+ {\r
+ sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, (interface->is_upstream?"dst":"src"), qos_free_dst_ipset, interface->name);\r
+ iptables_save_line(str, IPv4);\r
+ }\r
+ }\r
+\r
+ if(qos_free_src_ipset && *qos_free_src_ipset != '0') /* this is currently supported only for IPv4 */\r
+ {\r
+ for_each(interface, interfaces)\r
+ {\r
+ sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, (interface->is_upstream?"src":"dst"), qos_free_src_ipset, interface->name);\r
+ iptables_save_line(str, IPv4);\r
+ }\r
+ }\r
\r
for_each(qosfreeinterface, qosfreeinterfaces)\r
{\r
exit(0);\r
}\r
\r
- if(!mix_new_hosts && !just_preview)\r
+ if(!just_preview)\r
{\r
if(!dry_run && !nodelay && qos_free_delay)\r
{\r
}\r
}\r
\r
- if(mix_new_hosts)\r
- {\r
- /*-----------------------------------------------------------------*/\r
- puts("Locating heavy downloaders and generating root classes ...");\r
- /*-----------------------------------------------------------------*/\r
- sort(ip,ips,desc_order_by,traffic);\r
- }\r
+ /*-----------------------------------------------------------------*/\r
+ puts("Locating heavy downloaders and generating root classes ...");\r
+ /*-----------------------------------------------------------------*/\r
+ sort(ip,ips,desc_order_by,traffic); \r
\r
/*-----------------------------------------------------------------*/\r
for_each(interface, interfaces)\r
json_traffic=json_preview;\r
}\r
\r
- if(!mix_new_hosts && !dry_run && !just_flush)\r
+ if(!dry_run && !just_flush)\r
{\r
/*-----------------------------------------------------------------*/\r
printf("Writing json traffic overview %s ... ", json_traffic);\r
\r
printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);\r
exit(0);\r
- }\r
- \r
+ } \r
+\r
i=0;\r
#ifdef DEBUG\r
printf("%-22s %-15s mark\n","name","ip");\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff