/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified by: xChaos, 20220327\r
+/* Modified by: xChaos, 20231028\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 = "1.0.0-b";\r
+const char *version = "1.0.1";\r
\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
/* Versions: 0.9.0 is development release, 1.0 will be "stable" */\r
char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\r
char *mark = "MARK";\r
char *mark_iptables = "MARK --set-mark ";\r
-int dry_run = FALSE; /* preview - use puts() instead of system() */\r
+int dry_run = FALSE; /* preview commands - use puts() instead of system() */\r
+int skip_stats = FALSE; /* skip generating statistics */\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 *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 found_code = 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
}\r
}\r
\r
-\r
/* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
\r
char *index_id(char *ip, int bitmask);\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("-b") { run=TRUE; nodelay=TRUE; skip_stats=TRUE; }\r
argument("-a") { run=TRUE; just_networks=TRUE; }\r
argument("-l") { just_logs=TRUE; }\r
argument("-m") { just_logs=TRUE; }\r
interface->chain = "FORWARD";\r
interface->idxprefix = "forw";\r
push(interface, interfaces);\r
- printf("Upstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);\r
+ printf("Upstream interface %s: medium %s capacity %Ld kbps\n", interface->name, medium, interface->speed);\r
}\r
}\r
done; /* ugly macro end */\r
interface->chain = "POSTROUTING";\r
interface->idxprefix = "post";\r
push(interface, interfaces);\r
- printf("Downstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);\r
+ printf("Downstream interface %s: medium %s capacity %Ld kbps\n", interface->name, medium, interface->speed);\r
}\r
}\r
done; /* ugly macro end */\r
hosts = althosts;\r
}\r
\r
- if(just_flush<9)\r
+ if(just_flush<9 && !skip_stats)\r
{\r
/*-----------------------------------------------------------------*/\r
puts("Parsing iptables verbose output ...");\r
{\r
for_each(ip, ips) if(eq(technology->filename, ip->technology_str))\r
{\r
- fprintf(f,"%d,%s,%d\n", ip->lmsid, ip->ruian_id_str, ip->max);\r
+ fprintf(f,"%s,%s,%d\n", ip->code, ip->ruian_id_str, ip->max);\r
}\r
fclose(f);\r
}\r
sharedip->traffic_up += ip->upload;\r
ip->traffic = 0;\r
ip->mark = sharedip->mark; \r
- ip->lmsid = sharedip->lmsid;\r
+ ip->code = sharedip->code;\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
iptables_save_line(ip6preamble, IPv6);\r
}\r
\r
+ /* this doesn't seem to be way to go... about 2/3 of all packets have ACK flag set\r
+ maybe with --length 40:100 it would make some sense, but not enought \r
+ for_each(interface, interfaces)\r
+ {\r
+ sprintf(str,"-A %s -m tcp -p tcp --tcp-flags ACK ACK -o %s -j ACCEPT", interface->chain, interface->name);\r
+ iptables_save_line(str, IPv4);\r
+ }\r
+ */\r
+\r
if(qos_free_zone && *qos_free_zone != '0') /* this is currently supported only for IPv4 */\r
{\r
for_each(interface, interfaces)\r
agreg = (int)((float)(avg_mbps_down+1)/min_mbps+.5);\r
ip->max /= agreg;\r
ip->pps_limit /= agreg;\r
- printf("Download aggregation 1:%d for %s (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_down);\r
+ printf("Download aggregation 1:%d for %s (min: %d Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_down);\r
}\r
else\r
{\r
unshape_this_ip = 0;\r
agreg = (int)((float)(avg_mbps_up+1)/min_mbps+.5);\r
ip->max /= agreg;\r
- printf("Upload aggregation 1:%d for %s: (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);\r
+ printf("Upload aggregation 1:%d for %s: (min: %d Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);\r
}\r
else\r
{\r
json_traffic=json_preview;\r
}\r
\r
- if(!dry_run && !just_flush)\r
+ if(!dry_run && !just_flush && !skip_stats)\r
{\r
/*-----------------------------------------------------------------*/\r
printf("Writing json traffic overview %s ... ", json_traffic);\r
}\r
\r
/*-----------------------------------------------------------------*/\r
- printf(" + generating iptables and tc classes ... ");\r
+ printf(" + generating iptables and tc classes ... \n");\r
/*-----------------------------------------------------------------*/\r
\r
for_each(ip, ips) if(ip->mark > 0)\r
{\r
fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
}\r
+ printf(".");\r
}\r
if(f > 0)\r
{\r
- puts("done.");\r
+ puts(" done.");\r
fclose(f);\r
}\r
\r
sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, interface->name, FREE_CLASS, FREE_CLASS);\r
safe_run(str);\r
}\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 quantum %d",\r
- tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority, htb_quantum);\r
- safe_run(str);\r
+ if(*limit_pkts) /* non-empty string?*/\r
+ {\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 quantum %d", \r
+ tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority, htb_quantum);\r
+ safe_run(str);\r
+ }\r
} \r
printf("Total IP count: %d\n", i);\r
run_iptables_restore();\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff