http proxy is obsolete featre in 2013 (https:// everywhere , etc.)

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

diff --git a/parseiptables.c b/parseiptables.c
index cfd1add8018f5c711974c435df0b078e45bb11a0..cad83642137ca3e86e8c266452b1120f5d634bc3 100644 (file)
--- a/parseiptables.c
+++ b/parseiptables.c
@@ -8,7 +8,7 @@
 /* globals declared in prometheus.c */\r
 extern struct IP *ips, *ip, *sharedip;\r
 extern char *mark;\r
-extern char *proxy_ip;\r
+/* extern char *proxy_ip; */\r
 extern int free_min;\r
 extern int free_max;\r
 extern int include_upload;\r
@@ -36,7 +36,7 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
 \r
  for_each(line,lines)\r
  {\r
-  int col, accept = 0, proxyflag = 0, valid = 1, setchainname = 0, commonflag = 0; \r
+  int col, accept = 0, /*proxyflag = 0, */valid = 1, setchainname = 0, commonflag = 0; \r
   unsigned long long traffic = 0;\r
   unsigned long pkts = 0;\r
   char *ipaddr = NULL,*ptr;\r
@@ -98,14 +98,19 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
            }\r
            else if(!ipv6)\r
            {\r
-            if(downloadflag)\r
+\r
+/*          if(downloadflag)\r
             { \r
              if(strstr(proxy_ip,ptr))\r
              {\r
               proxyflag = 1;\r
              }\r
-            }\r
-            else\r
+\r
+            } \r
+            else \r
+            { \r
+*/\r
+            if(!downloadflag)\r
             {\r
              ipaddr = ptr;\r
             }\r
@@ -131,12 +136,14 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
    {\r
     printf("(IPv4) ");\r
    }\r
-   \r
+/*   \r
    if(proxyflag)\r
    {\r
     printf("(proxy) ");\r
    }\r
-   else if(!downloadflag)\r
+   else\r
+*/   \r
+   if(!downloadflag)\r
    {\r
     printf("(up) ");\r
    }\r
@@ -165,15 +172,16 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
    \r
    if(downloadflag)\r
    {\r
+/*\r
     if(proxyflag)\r
     {\r
      ip->proxy = traffic;\r
     }\r
     else\r
-    {\r
+    {*/\r
      ip->traffic += traffic;\r
-    }\r
-    ip->direct += ip->traffic-ip->upload-ip->proxy;\r
+/*    } */\r
+/*    ip->direct += ip->traffic-ip->upload; /*-ip->proxy;*/\r
     ip->pktsdown += pkts;\r
    }\r
    else\r

diff --git a/prometheus.c b/prometheus.c
index b6807fde47139d8b27497265ebadce5924cf56c9..1227592f5e566027f35ced5bf9272bc9c0234e6f 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -101,8 +101,8 @@ char    *qos_free_zone = NULL; /* QoS free zone */
 /* 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
-int         proxy_port = 3128; /* proxy port number */\r
+/* char         *proxy_ip = "192.168.1.1/32";  our IP with proxy port */\r
+/* int         proxy_port = 3128; proxy port number */\r
 long long int     line = 1024; /* WAN/ISP download in kbps */\r
 long long int       up = 1024; /* WAN/ISP upload in kbps */\r
 int           free_min = 256; /* minimum guaranted bandwidth for all undefined hosts */\r
@@ -311,9 +311,9 @@ void get_config(char *config_filename)
   option("qos-free-zone",qos_free_zone);\r
   ioption("qos-free-delay",qos_free_delay);\r
 /*  ioption("qos-proxy-enable",qos_proxy); */\r
-  option("qos-proxy-ip",proxy_ip);\r
+/*  option("qos-proxy-ip",proxy_ip);*/\r
   option("htb-leaf-discipline",qos_leaf);\r
-  ioption("qos-proxy-port",proxy_port);\r
+/*  ioption("qos-proxy-port",proxy_port); */\r
   ioption("free-rate",free_min);\r
   ioption("free-ceil",free_max);\r
   ioption("htb-burst",burst);\r