X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=parseiptables.c;h=cad83642137ca3e86e8c266452b1120f5d634bc3;hb=7ae5a5939e4328ed4a1d8c025ea6769265574260;hp=ea9ef965b44dd26ceb4309cd266b6076749d0c7a;hpb=cdfd88eb2cfba828e5bfc3f77eba37b3cba286ce;p=svn%2FPrometheus-QoS%2F.git

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