GIT.Harvie.CZ
/
svn
/
Prometheus-QoS
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bugfix - no data were logged if no IPV6 traffic detected, by mistake
[svn/Prometheus-QoS/.git]
/
parseiptables.c
diff --git
a/parseiptables.c
b/parseiptables.c
index cfd1add8018f5c711974c435df0b078e45bb11a0..db984fa923035a878541da78ac597c17f2f11ff4 100644
(file)
--- a/
parseiptables.c
+++ b/
parseiptables.c
@@
-1,4
+1,4
@@
-/* Modified by: xChaos, 20131
029
*/
\r
+/* Modified by: xChaos, 20131
208
*/
\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,17
+8,19
@@
/* 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
\r
extern int free_min;
\r
extern int free_max;
\r
extern int include_upload;
\r
\r
+int traffic_detected = 0;
\r
+
\r
/* ===================== traffic analyser - uses iptables ================ */
\r
\r
void get_traffic_statistics(const char *whichiptables, int ipv6)
\r
{
\r
char *str,*cmd;
\r
/* ===================== traffic analyser - uses iptables ================ */
\r
\r
void get_traffic_statistics(const char *whichiptables, int ipv6)
\r
{
\r
char *str,*cmd;
\r
- int downloadflag
=
0;
\r
+ int downloadflag
=
0;
\r
\r
textfile(Pipe,str) *line,*lines=NULL;
\r
string(str,STRLEN);
\r
\r
textfile(Pipe,str) *line,*lines=NULL;
\r
string(str,STRLEN);
\r
@@
-36,7
+38,7
@@
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
unsigned long long traffic = 0;
\r
unsigned long pkts = 0;
\r
char *ipaddr = NULL,*ptr;
\r
@@
-98,14
+100,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
+136,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
@@
-145,6
+152,7
@@
void get_traffic_statistics(const char *whichiptables, int ipv6)
printf("(down) ");
\r
}
\r
\r
printf("(down) ");
\r
}
\r
\r
+ traffic_detected = 1;
\r
printf("%s %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);
\r
\r
if_exists(ip, ips, eqi(ip->addr,ipaddr));
\r
printf("%s %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);
\r
\r
if_exists(ip, ips, eqi(ip->addr,ipaddr));
\r
@@
-165,20
+173,23
@@
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
+ {*/
\r
+ ip->traffic += traffic;
\r
+ ip->traffic_down += traffic;
\r
+/* } */
\r
+ ip->direct += traffic; /*-ip->proxy;*/
\r
ip->pktsdown += pkts;
\r
}
\r
else
\r
{
\r
ip->upload += traffic;
\r
ip->pktsdown += pkts;
\r
}
\r
else
\r
{
\r
ip->upload += traffic;
\r
+ ip->traffic_up += traffic;
\r
ip->pktsup += pkts;
\r
if(include_upload)
\r
{
\r
ip->pktsup += pkts;
\r
if(include_upload)
\r
{
\r
This page took
0.135596 seconds
and
4
git commands to generate.