proxy taffic shaping will be obsolete feature in 0.8.4

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@237 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/parseiptables.c b/parseiptables.c
index ea9ef965b44dd26ceb4309cd266b6076749d0c7a..cfd1add8018f5c711974c435df0b078e45bb11a0 100644 (file)
--- a/parseiptables.c
+++ b/parseiptables.c
@@ -173,22 +173,22 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
     {\r
      ip->traffic += traffic;\r
     }\r
-    ip->direct = ip->traffic-ip->upload-ip->proxy;\r
-    ip->pktsdown = pkts;\r
+    ip->direct += ip->traffic-ip->upload-ip->proxy;\r
+    ip->pktsdown += pkts;\r
    }\r
    else\r
    {\r
-    ip->upload = traffic;\r
-    ip->pktsup = pkts;\r
+    ip->upload += traffic;\r
+    ip->pktsup += pkts;\r
     if(include_upload)\r
     {\r
      ip->traffic += traffic;\r
     }\r
     else \r
     {\r
-     if(traffic > ip->traffic)\r
+     if(ip->upload > ip->traffic)\r
      {\r
-      ip->traffic = traffic;     \r
+      ip->traffic = ip->upload;\r
      }\r
     }\r
    }\r

diff --git a/prometheus.c b/prometheus.c
index dea239a2e9366b429790ce9389f976486fe23a03..b6807fde47139d8b27497265ebadce5924cf56c9 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -98,7 +98,7 @@ char        *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */
 char       *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
 char         *qos_leaf = "sfq perturb 5"; /* leaf discipline */\r
 char    *qos_free_zone = NULL; /* QoS free zone */\r
-int          qos_proxy = TRUE; /* include proxy port to QoS */\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     include_upload = TRUE; /* upload+download=total traffic */\r
 char         *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */\r
@@ -310,7 +310,7 @@ void get_config(char *config_filename)
   ioption("use-jquery-popups",use_jquery_popups);\r
   option("qos-free-zone",qos_free_zone);\r
   ioption("qos-free-delay",qos_free_delay);\r
-  ioption("qos-proxy-enable",qos_proxy);\r
+/*  ioption("qos-proxy-enable",qos_proxy); */\r
   option("qos-proxy-ip",proxy_ip);\r
   option("htb-leaf-discipline",qos_leaf);\r
   ioption("qos-proxy-port",proxy_port);\r