-/* Modified by: xChaos, 20130115 */\r
+/* Modified by: xChaos, 20131029 */\r
\r
#include "cll1-0.6.2.h"\r
#include "ipstruct.h"\r
\r
/* ===================== traffic analyser - uses iptables ================ */ \r
\r
-void get_traffic_statistics(const char *whichiptables)\r
+void get_traffic_statistics(const char *whichiptables, int ipv6)\r
{\r
char *str,*cmd;\r
int downloadflag=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
{\r
accept = eq(ptr,mark);\r
}\r
- /*if(filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/\r
break;\r
- case 8: if(downloadflag)\r
- { \r
- if(strstr(proxy_ip,ptr))\r
+ case 7: if(ipv6 && !downloadflag)\r
+ {\r
+ ipaddr = ptr;\r
+ }\r
+ break;\r
+ case 8: if(ipv6 && downloadflag)\r
+ {\r
+ ipaddr = ptr;\r
+ }\r
+ else if(!ipv6)\r
+ {\r
+ if(downloadflag)\r
+ { \r
+ if(strstr(proxy_ip,ptr))\r
+ {\r
+ proxyflag = 1;\r
+ }\r
+ }\r
+ else\r
{\r
- proxyflag = 1;\r
+ ipaddr = ptr;\r
}\r
}\r
- else\r
+ break;\r
+ case 9: if(!ipv6 && downloadflag)\r
{\r
ipaddr = ptr;\r
}\r
break;\r
- case 9: if(downloadflag)ipaddr = ptr;break;\r
}\r
\r
if(accept && traffic>0 && ipaddr)\r
{\r
+ /* IPv6 subnet - /64 */\r
+ char *isipv6 = strstr(ipaddr,"/64");\r
+ if(ipv6 && isipv6)\r
+ {\r
+ *isipv6=0;\r
+ printf("(IPv6) ");\r
+ }\r
+ else\r
+ {\r
+ printf("(IPv4) ");\r
+ }\r
+ \r
if(proxyflag)\r
{\r
printf("(proxy) ");\r
}\r
else if(!downloadflag)\r
{\r
- printf("(upload) ");\r
+ printf("(up) ");\r
}\r
- printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);\r
+ else\r
+ {\r
+ printf("(down) ");\r
+ }\r
+ \r
+ printf("%s %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);\r
\r
- if_exists(ip,ips,eq(ip->addr,ipaddr)); \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