-/* Modified by: xChaos, 20131029 */\r
+/* Modified by: xChaos, 20131220 */\r
\r
#include "cll1-0.6.2.h"\r
#include "ipstruct.h"\r
extern struct IP *ips, *ip, *sharedip, *networks;\r
extern struct Group *groups, *group;\r
extern struct Keyword *keyword, *defaultkeyword, *keywords;\r
+extern struct Macro *macro, *macros;\r
extern int class_count;\r
extern int ip_count;\r
extern int found_lmsid;\r
void TheIP(char *ipaddr, int is_network)\r
{\r
create(ip,IP);\r
- ip->name = "";\r
- ip->addr = ipaddr;\r
- ip->sharing = NULL;\r
- ip->prio = highest_priority+1;\r
- ip->lmsid = -1;\r
- ip->fixedprio = \\r
- ip->mark = \\r
- ip->min = \\r
- ip->max = \\r
- ip->desired = \\r
- ip->credit = \\r
- ip->upload = \\r
- ip->proxy = \\r
- ip->direct = \\r
- ip->traffic = \\r
- ip->pktsup = \\r
- ip->pps_limit = \\r
- ip->pktsdown = 0;\r
- ip->keyword = keywords;\r
- ip->v6 = (strchr(ip->addr,':')!=NULL);\r
- ip->mask = ((ip->v6)?64:32);\r
+ ip->name = "";\r
+ ip->addr = ipaddr;\r
+ ip->sharing = NULL;\r
+ ip->prio = highest_priority+1;\r
+ ip->lmsid = -1;\r
+ ip->fixedprio = \\r
+ ip->aggregated = \\r
+ ip->mark = \\r
+ ip->min = \\r
+ ip->max = \\r
+ ip->desired = \\r
+ ip->credit = \\r
+ ip->upload = \\r
+ ip->proxy = \\r
+ ip->direct = \\r
+ ip->traffic = \\r
+ ip->traffic_down = \\r
+ ip->traffic_up = \\r
+ ip->pktsup = \\r
+ ip->pps_limit = \\r
+ ip->pktsdown = 0;\r
+ ip->keyword = keywords;\r
+ ip->v6 = (strchr(ip->addr,':')!=NULL);\r
+ ip->mask = ((ip->v6)?64:32);\r
if(is_network)\r
{\r
push(ip, networks);\r
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
concatenate(ip6prefix,ip6range,ptr);\r
ip6range=ptr;\r
- if_exists(ip, ips, eq(ip->addr,ip6range));\r
+ if_exists(ip, ips, eq(ip->addr,ip6range)); /* check - allocated range must be unique */\r
else\r
{\r
TheIP(ip6range, FALSE);\r
{\r
ip->lmsid = atoi(lmsid);\r
}\r
- lastIP6 = ip;\r
+ lastIP6range = ip;\r
}\r
else\r
{\r
- lastIP6 = NULL;\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
+ TheIP(ip6uplink, FALSE); /* always new IP - more IPs in single uplink network */\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
+ lastIP6uplink = NULL;\r
}\r
\r
if_exists(ip, listhead, eq(ip->addr,ipaddr));\r
char *str, *ptr;\r
char *substring;\r
struct IP *network;\r
+ int pktratio;\r
\r
parse(hosts)\r
{\r
- str=_;\r
+ str = _;\r
\r
if(*str < '0' or *str > '9')\r
{\r
/* any line starting with non-number is comment ...*/\r
continue;\r
}\r
- \r
+\r
+ ptr = strchr(str,'\r'); /* fore unix-style end of line */\r
+ if(ptr)\r
+ {\r
+ *ptr = 0;\r
+ }\r
+ \r
+ /* first, expand (rewrite) any predefined macros, if found*/\r
+ for_each(macro, macros)\r
+ {\r
+ substring = strstr(str, macro->rewrite_from);\r
+ if(substring)\r
+ {\r
+ int l1, l3;\r
+ *substring = 0;\r
+ substring += strlen(macro->rewrite_from);\r
+ l1 = strlen(str);\r
+ l3 = strlen(substring);\r
+ string(ptr, l1 + strlen(macro->rewrite_to) + l3 + 1);\r
+ strcpy(ptr, str);\r
+ strcat(ptr, macro->rewrite_to);\r
+ strcat(ptr, substring);\r
+ str = ptr;\r
+ /* printf("REWRITE: %s -> %s\n",_,str); */\r
+ }\r
+ }\r
+\r
/* Does this IP share QoS class with some other ? */\r
substring = strstr(str, "sharing-");\r
if(substring)\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
- lastIP6->sharing = substring;\r
- lastIP6 = NULL;\r
+ lastIP6range->sharing = substring;\r
+ lastIP6range = NULL;\r
+ }\r
+ if(lastIP6uplink)\r
+ {\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
}\r
\r
- /* MTU is 1450 bytes = 11600 bits ~= 12 kbit, max is in kb/s */\r
- ip->pps_limit = ip->max/12;\r
- if(ip->pps_limit > 10000) /* this limit seems to be hardcoded in iptables */\r
+ /* avg MTU bytes * 8 >> 10 = in bits, max is in kb/s */\r
+ pktratio = (ip->keyword->allowed_avgmtu*8) >> 10;\r
+ if(pktratio > 0)\r
{\r
- ip->pps_limit = 0; /* do not apply packet limits */\r
+ ip->pps_limit = ip->max/pktratio;\r
+ if(ip->pps_limit > 10000) /* this limit seems to be hardcoded in iptables */\r
+ {\r
+ ip->pps_limit = 0; /* do not apply packet limits */\r
+ }\r
}\r
\r
ip->mark = FIRSTIPCLASS+1+class_count++; \r
// TheIP("0.0.0.0", TRUE);\r
// ip->name = "TOTAL";\r
// ip->mask = 0;\r
-}
\ No newline at end of file
+}\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff