#define option(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=_V; _=NULL;} else free(_Q);}
#define ioption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=atoi(_V); _=NULL;} free(_Q);}
#define loption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=atol(_V); _=NULL;} free(_Q);}
+#define foption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=atof(_V); _=NULL;} free(_Q);}
#define lloption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=atoll(_V); _=NULL;} free(_Q);}
/* Dynamic list advanced I/O, updated 2003-05-30 by xCh. */
ip_count++;\r
}\r
\r
-struct IP *lastIP6;\r
+struct IP *lastIP6range, *lastIP6uplink;\r
\r
/* == This function strips extra characters after IPv4 address and stores it = */\r
void parse_and_append_ip(char *str, struct IP *listhead)\r
{\r
- char *ptr, *ipaddr, *ip6range = NULL, *ipname = NULL, *lmsid = NULL;\r
+ char *ptr, *ipaddr, *nextip6, *ip6buf; \r
+ char *ip6uplink = NULL, *ip6range = NULL, *ipname = NULL, *lmsid = NULL;\r
\r
if(ip6prefix) /* Try this only if IPv6 subsystem is active... */\r
{\r
ptr = strstr(str, "::");\r
- if(ptr && ptr-str > 4)\r
+ while(ptr && ptr-str > 4)\r
{\r
- ptr -= 4; \r
- duplicate(ptr, ip6range);\r
- ptr = strstr(ip6range, "::");\r
+ nextip6 = strstr(ptr + 2, "::");\r
+ ptr -= 4;\r
+ duplicate(ptr, ip6buf);\r
+ ptr = strstr(ip6buf, "::");\r
if(ptr)\r
{\r
- *(ptr+2) = 0;\r
+ if(*(ptr+2) == '+')\r
+ {\r
+ *(ptr+3) = 0; /* ends with ::+ */\r
+ ip6uplink = ip6buf;\r
+ }\r
+ else\r
+ {\r
+ *(ptr+2) = 0; /* ends with :: */\r
+ ip6range = ip6buf;\r
+ } \r
}\r
+ ptr = nextip6;\r
}\r
}\r
\r
{\r
ptr++;\r
}\r
- ipname=ptr; \r
+ ipname = ptr; \r
while(*ptr and *ptr!=' ' and *ptr!=9)\r
{\r
ptr++;\r
{\r
ip->lmsid = atoi(lmsid);\r
}\r
- lastIP6 = ip;\r
+ lastIP6range = ip;\r
+ }\r
+ else\r
+ {\r
+ lastIP6range = NULL;\r
+ }\r
+\r
+ /* it is ugly to copy+paste and search+replace, but... */\r
+ if(ip6uplink)\r
+ {\r
+ concatenate(ip6prefix,ip6uplink,ptr);\r
+ ip6uplink=ptr;\r
+ if_exists(ip, ips, eq(ip->addr,ip6uplink));\r
+ else\r
+ {\r
+ TheIP(ip6uplink, FALSE);\r
+ }\r
+ ip->name = ip6uplink;\r
+ ip->keyword = defaultkeyword; /* settings for default keyword */\r
+ if(lmsid)\r
+ {\r
+ ip->lmsid = atoi(lmsid);\r
+ }\r
+ lastIP6uplink = ip;\r
}\r
else\r
{\r
- lastIP6 = NULL;\r
+ lastIP6uplink = NULL;\r
}\r
\r
if_exists(ip, listhead, eq(ip->addr,ipaddr));\r
parse_and_append_ip(str, ips);\r
ip->sharing = substring;\r
ip->keyword = defaultkeyword; /* settings for default keyword */\r
- if(lastIP6)\r
+ if(lastIP6range)\r
+ {\r
+ lastIP6range->sharing = substring;\r
+ lastIP6range = NULL;\r
+ }\r
+ if(lastIP6uplink)\r
{\r
- lastIP6->sharing = substring;\r
- lastIP6 = NULL;\r
+ lastIP6uplink->sharing = substring;\r
+ lastIP6uplink = NULL;\r
}\r
while(*substring and *substring != '\n')\r
{\r
else\r
{\r
substring = strstr(str, "#255.");\r
- if(substring and not strstr(str, "#255.255.255.255")) /* do not ping /32 ranges */\r
+ if(substring and not strstr(str, "#255.255.255.255")) /* do not ping /32 uplinks */\r
{\r
/* netmask detected - save network*/\r
unsigned bit;\r
if_exists(keyword,keywords,(substring=strstr(str,keyword->key)))\r
{\r
parse_and_append_ip(str, ips);\r
- if(lastIP6)\r
+ if(lastIP6range)\r
+ {\r
+ lastIP6range->sharing = ip->name;\r
+ lastIP6range = NULL;\r
+ }\r
+ if(lastIP6uplink)\r
{\r
- lastIP6->sharing = ip->name;\r
- lastIP6 = NULL;\r
+ lastIP6uplink->sharing = ip->name;\r
+ lastIP6uplink = NULL;\r
}\r
ip->keyword = keyword;\r
keyword->ip_count++;\r
{\r
char *tmptr=_; /* <---- l+1 ----> */\r
_+=l+1; /* via-prometheus-asymetry-ratio, etc. */\r
- ioption("asymetry-ratio", keyword->asymetry_ratio);\r
+ foption("asymetry-ratio", keyword->asymetry_ratio);\r
ioption("asymetry-treshold", keyword->asymetry_fixed);\r
ioption("magic-relative-limit", keyword->data_limit);\r
ioption("magic-relative-prio", keyword->data_prio);\r
\r
printf("\n\\r
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\\r
-Version %s - Copyright (C)2005-2013 Michael Polak, Arachne Labs\n\\r
+Version %s - Copyright (C)2005-2014 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
ip->mark = sharedip->mark; \r
ip->lmsid = sharedip->lmsid;\r
ip->pps_limit = sharedip->pps_limit; /* no other way to do this */\r
+\r
+ /* Ugly hack: append IPv4 addresses of sharedip to IPv6 uplinks */\r
+ ptr = strchr(ip->addr, '+');\r
+ if(ptr && ptr-ip->addr > 1 && !sharedip->v6)\r
+ {\r
+ *(--ptr) = 0;\r
+ concatenate(ip->addr, sharedip->addr, ptr);\r
+ ip->name = ip->addr = ptr;\r
+ ptr = strchr(ip->addr, '.');\r
+ while(ptr && *ptr)\r
+ {\r
+ *ptr = ':';\r
+ ptr = strchr(ptr, '.');\r
+ }\r
+ ip->mask += 64;\r
+ }\r
+\r
break;\r
}\r
if(not sharedip)\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),\r
+ chain_postrouting, ip->addr, ip->mask,\r
lan, mark_iptables, ip->mark);\r
iptables_save_line(str, ip->v6);\r
\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,\r
- 32*(1+ip->v6), lan, mark_iptables, ip->mark);\r
+ ip->mask, 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
+ chain_postrouting, ip->addr, ip->mask, 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
+ chain_postrouting, ip->addr, ip->mask,\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_postrouting, ip->addr, ip->mask, lan);\r
iptables_save_line(str, ip->v6);\r
\r
/* -------------------------------------------------------- mark upload */\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, ip->mark);\r
+ chain_forward, ip->addr, ip->mask, 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
+ chain_forward, ip->addr, ip->mask, 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
+ chain_forward, ip->addr, ip->mask, 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
+ chain_forward, ip->addr, ip->mask, wan);\r
iptables_save_line(str, ip->v6);\r
\r
if(ip->min)\r