X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=parseiptables.c;h=db984fa923035a878541da78ac597c17f2f11ff4;hb=334291fb74ea2fe31fb39f4ff0249ba4a3c6764d;hp=cfd1add8018f5c711974c435df0b078e45bb11a0;hpb=7d05bfc0742ea64ad5b1b5511a0c89a8da0badcc;p=svn%2FPrometheus-QoS%2F.git

diff --git a/parseiptables.c b/parseiptables.c
index cfd1add..db984fa 100644
--- a/parseiptables.c
+++ b/parseiptables.c
@@ -1,4 +1,4 @@
-/* Modified by: xChaos, 20131029 */
+/* Modified by: xChaos, 20131208 */
 
 #include "cll1-0.6.2.h"
 #include "ipstruct.h"
@@ -8,17 +8,19 @@
 /* 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;
 
+int traffic_detected = 0;
+
 /* ===================== traffic analyser - uses iptables  ================ */ 
 
 void get_traffic_statistics(const char *whichiptables, int ipv6)
 {
  char *str,*cmd;
- int downloadflag=0;
+ int downloadflag = 0;
 
  textfile(Pipe,str) *line,*lines=NULL;
  string(str,STRLEN);
@@ -36,7 +38,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 +100,17 @@ 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) ");
    }
@@ -145,6 +152,7 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
     printf("(down) ");
    }
    
+   traffic_detected = 1;
    printf("%s %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);
 
    if_exists(ip, ips, eqi(ip->addr,ipaddr)); 
@@ -165,20 +173,23 @@ 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->traffic += traffic;
+    ip->traffic_down += traffic;
+/*    } */
+    ip->direct += traffic; /*-ip->proxy;*/
     ip->pktsdown += pkts;
    }
    else
    {
     ip->upload += traffic;
+    ip->traffic_up += traffic;
     ip->pktsup += pkts;
     if(include_upload)
     {