/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified by: xChaos, 20130124\r
+/* Modified by: xChaos, 20131118\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
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
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
/* 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
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
+ ip->pps_limit = sharedip->pps_limit; /* no other way to do this */\r
break;\r
}\r
if(not sharedip)\r
/* -------------------------------------------------------- mark download */\r
\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
+ chain_postrouting, ip->addr, 32*(1+ip->v6),\r
+ lan, mark_iptables, ip->mark);\r
/* -m limit --limit 1/s */ \r
iptables_save_line(str, ip->v6);\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 -j ACCEPT",\r
- chain_postrouting, ip->addr, 32*(1+ip->v6), lan);\r
+ /* this will be optional in future - hardcoded for now*/\r
+ sprintf(limit_pkts,"-m limit --limit %d/s ", ip->pps_limit);\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
/* -------------------------------------------------------- mark upload */\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 -j ACCEPT",\r
- chain_forward, ip->addr, 32*(1+ip->v6), wan);\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
if(ip->min)\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