macro definitions...

[svn/Prometheus-QoS/.git] / parseiptables.c

diff --git a/parseiptables.c b/parseiptables.c
index 1f22d132226dcfefc637f6ba8cc02b890c81282f..eca2ced6221c4af51d98be83b5a9c0adf9376c86 100644 (file)
--- a/parseiptables.c
+++ b/parseiptables.c
@@ -1,4 +1,4 @@
-/* Modified by: xChaos, 20130115 */\r
+/* Modified by: xChaos, 20131208 */\r

 \r
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
 \r
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r


@@ -8,7 +8,7 @@
 /* globals declared in prometheus.c */\r
 extern struct IP *ips, *ip, *sharedip;\r
 extern char *mark;\r
 /* 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
 extern int free_min;\r
 extern int free_max;\r
 extern int include_upload;\r


@@ -36,12 +36,12 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
 \r
  for_each(line,lines)\r
  {\r
 \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
   \r
   unsigned long long traffic = 0;\r
   unsigned long pkts = 0;\r
   char *ipaddr = NULL,*ptr;\r
   \r

-  valid_columns(ptr, line->str, ' ', col) \r
+  valid_columns(ptr, line->str, ' ', col)\r

   if(valid) switch(col)\r
   { \r
    case 1: if(eq(ptr,"Chain"))\r
   if(valid) switch(col)\r
   { \r
    case 1: if(eq(ptr,"Chain"))\r


@@ -98,14 +98,17 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
            }\r
            else if(!ipv6)\r
            {\r
            }\r
            else if(!ipv6)\r
            {\r

-            if(downloadflag)\r
+/*          if(downloadflag)\r

             { \r
              if(strstr(proxy_ip,ptr))\r
              {\r
               proxyflag = 1;\r
              }\r
             { \r
              if(strstr(proxy_ip,ptr))\r
              {\r
               proxyflag = 1;\r
              }\r

-            }\r
-            else\r
+\r
+            } \r
+            else \r
+            {  */\r
+            if(!downloadflag)\r

             {\r
              ipaddr = ptr;\r
             }\r
             {\r
              ipaddr = ptr;\r
             }\r


@@ -131,12 +134,14 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
    {\r
     printf("(IPv4) ");\r
    }\r
    {\r
     printf("(IPv4) ");\r
    }\r

-   \r
+/*   \r

    if(proxyflag)\r
    {\r
     printf("(proxy) ");\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
    {\r
     printf("(up) ");\r
    }\r


@@ -150,7 +155,7 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
    if_exists(ip, ips, eqi(ip->addr,ipaddr)); \r
    else \r
    {\r
    if_exists(ip, ips, eqi(ip->addr,ipaddr)); \r
    else \r
    {\r

-    TheIP(ipaddr);\r
+    TheIP(ipaddr, FALSE);\r

     if(eq(ip->addr,"0.0.0.0/0"))\r
     {\r
      ip->name = "(unregistered)";\r
     if(eq(ip->addr,"0.0.0.0/0"))\r
     {\r
      ip->name = "(unregistered)";\r


@@ -165,30 +170,31 @@ void get_traffic_statistics(const char *whichiptables, int ipv6)
    \r
    if(downloadflag)\r
    {\r
    \r
    if(downloadflag)\r
    {\r

+/*\r

     if(proxyflag)\r
     {\r
      ip->proxy = traffic;\r
     }\r
     else\r
     if(proxyflag)\r
     {\r
      ip->proxy = traffic;\r
     }\r
     else\r

-    {\r
-     ip->traffic += traffic;\r
-    }\r
-    ip->direct = ip->traffic-ip->upload-ip->proxy;\r
-    ip->pktsdown = pkts;\r
+    {*/\r
+    ip->traffic += traffic;\r
+/*    } */\r
+    ip->direct += traffic; /*-ip->proxy;*/\r
+    ip->pktsdown += pkts;\r

    }\r
    else\r
    {\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(include_upload)\r
     {\r
      ip->traffic += traffic;\r
     }\r
     else \r
     {\r

-     if(traffic > ip->traffic)\r
+     if(ip->upload > ip->traffic)\r

      {\r
      {\r

-      ip->traffic = traffic;     \r
+      ip->traffic = ip->upload;\r

      }\r
     }\r
    }\r
      }\r
     }\r
    }\r