X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=1c917386c82e7d68cb1d747f7fc6733f73bd59e8;hp=7adff3cc6b493b5b9481a6284af7b6265e799b7d;hb=47b5fd64878b8e1206cbdc7fc2ec65308b0d9e89;hpb=4deb2d6f2b43232cf5e782ebb1deb9b0e041def9
diff --git a/prometheus.c b/prometheus.c
index 7adff3c..1c91738 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -2,12 +2,12 @@
/* Prometheus QoS - you can "steal fire" from your ISP */
/* "fair-per-IP" quality of service (QoS) utility */
/* requires Linux 2.4.x or 2.6.x with HTB support */
-/* Copyright(C) 2005-2017 Michael Polak, Arachne Aerospace */
+/* Copyright(C) 2005-2020 Michael Polak, Arachne Aerospace */
/* iptables-restore support Copyright(C) 2007-2008 ludva */
/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Modified by: xChaos, 20171106
+/* Modified by: xChaos, 20200107
ludva, 20080415
Prometheus QoS is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
#include "cll1-0.6.2.h"
#include "ipstruct.h"
-const char *version = "0.9.0-b";
+const char *version = "1.0.0-a";
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
/* Versions: 0.9.0 is development release, 1.0 will be "stable" */
@@ -40,7 +40,7 @@ const char *version = "0.9.0-b";
/* Warning: unofficial Github mirror is not supported by author! */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2017 Michael Polak, Arachne Labs\n";
+const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2020 Michael Polak, Arachne Labs\n";
#define STRLEN 512
#undef DEBUG
@@ -63,6 +63,7 @@ char *upstreamfile = "/etc/prometheus/upstream.interfaces"; /* list of interf
char *downstreamfile = "/etc/prometheus/downstream.interfaces"; /* list of interfaces to manage */
char *qosfreefile = "/etc/prometheus/qosfree.interfaces"; /* list of interfaces to manage */
char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/
+char *iptablesdump = "/var/spool/prometheus.iptables-dump"; /* temporary file for iptables -L -v -x -n -t mangle */
char *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-restore*/
char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */
char *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */
@@ -101,6 +102,8 @@ char *medium = "1000Mbit"; /* 10Mbit/100Mbit ethernet */
char *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */
char *qos_leaf = "sfq perturb 5"; /* leaf discipline */
char *qos_free_zone = NULL; /* QoS free zone */
+char *qos_free_dst_ipset = NULL; /* QoS free zone - dst match ipset name, must be prepared outside prometheus */
+char *qos_free_src_ipset = NULL; /* QoS free zone - src match ipset name, must be prepared outside prometheus */
/* int qos_proxy = TRUE; include proxy port to QoS */
int found_lmsid = FALSE; /* show links to users in LMS information system */
int include_upload = TRUE; /* upload+download=total traffic */
@@ -288,6 +291,7 @@ void get_config(char *config_filename)
option("ip6tables-save",ip6tablessave);
option("ip6tables-restore",ip6tablesrestore);
option("iptables-in-filename",iptablesfile);
+ option("iptables-dump-filename",iptablesdump);
option("ip6tables-in-filename",ip6tablesfile);
option("hosts",hosts);
option("downstream-interfaces-list-filename",downstreamfile);
@@ -314,6 +318,8 @@ void get_config(char *config_filename)
option("lms-url",lms_url);
ioption("use-jquery-popups",use_jquery_popups);
option("qos-free-zone",qos_free_zone);
+ option("qos-free-dst-ipset",qos_free_dst_ipset);
+ option("qos-free-src-ipset",qos_free_src_ipset);
ioption("qos-free-delay",qos_free_delay);
/* ioption("qos-proxy-enable",qos_proxy); */
/* option("qos-proxy-ip",proxy_ip);*/
@@ -636,14 +642,34 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("Parsing class defintion file %s ...\n", hosts);
/*-----------------------------------------------------------------*/
parse_hosts(hosts);
-/*
- //this was pretty dumb idea anyway...
- if(just_networks)
+
+#ifdef MONITORINGTRHU_CTU
+//special hack only to generate certain required CSV statistics for www.ctu.cz (regulation body)
+//not required for everyday use, requires special syntax sugar in hosts file, see parsehosts.c
+ for_each(technology, technologies)
{
- analyse_topology("/usr/sbin/traceroute -n -m 10 -w 2 %s.%d");
- exit(-1);
- }
-*/
+ char *filename;
+ FILE *f;
+ string(filename, strlen(log_dir) + strlen(technology->filename) + 5);
+ strcpy(filename, html_log_dir);
+ strcat(filename, technology->filename);
+ strcat(filename, ".csv");
+ /*-----------------------------------------------------------------*/
+ printf("Writing report file %s ...\n", filename);
+ /*-----------------------------------------------------------------*/
+ f = fopen(filename, "w");
+ if(f)
+ {
+ for_each(ip, ips) if(eq(technology->filename, ip->technology_str))
+ {
+ fprintf(f,"%d,%s,%d\n", ip->lmsid, ip->ruian_id_str, ip->max);
+ }
+ fclose(f);
+ }
+ else
+ perror(filename);
+ }
+#endif
/*-----------------------------------------------------------------*/
puts("Resolving shared connections ...");
@@ -755,7 +781,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
iptables_save_line(ip6preamble, IPv6);
}
- if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */
+ if(qos_free_zone && *qos_free_zone != '0') /* this is currently supported only for IPv4 */
{
for_each(interface, interfaces)
{
@@ -763,6 +789,24 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
iptables_save_line(str, IPv4);
}
}
+
+ if(qos_free_dst_ipset && *qos_free_dst_ipset != '0') /* this is currently supported only for IPv4 */
+ {
+ for_each(interface, interfaces)
+ {
+ sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, qos_free_dst_ipset, (interface->is_upstream?"dst":"src"), interface->name);
+ iptables_save_line(str, IPv4);
+ }
+ }
+
+ if(qos_free_src_ipset && *qos_free_src_ipset != '0') /* this is currently supported only for IPv4 */
+ {
+ for_each(interface, interfaces)
+ {
+ sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, qos_free_src_ipset, (interface->is_upstream?"src":"dst"), interface->name);
+ iptables_save_line(str, IPv4);
+ }
+ }
for_each(qosfreeinterface, qosfreeinterfaces)
{
@@ -1198,6 +1242,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("Writing statistics into HTML page %s ...\n", html);
/*-----------------------------------------------------------------*/
write_htmlandlogs(html, d, total, just_preview);
+ printf("\n");
}
if(just_preview)