X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=e58677c13350faa9af4fe1783fbab7f050fc9cca;hp=494ce5085b60acedff8d96dbf67f5370ab3b88e1;hb=105c88bcf2ecbb305ec3003907a376b8d5771f8f;hpb=52e8df5d8b101f15c4287c9fe7e9e5154cef76a4
diff --git a/prometheus.c b/prometheus.c
index 494ce50..e58677c 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Modified by: xChaos, 20120516
+/* Modified by: xChaos, 20120610
ludva, 20080415
Prometheus QoS is free software; you can redistribute it and/or
@@ -33,14 +33,14 @@
#include "cll1-0.6.2.h"
-const char *version = "0.8.3-d";
+const char *version = "0.8.3-e";
/* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */
/* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */
/* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */
/* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */
-const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2012 Michael Polak, Arachne Labs\n";
+const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2012 Michael Polak, Arachne Labs\n";
/* ======= All path names are defined here (for RPM patch) ======= */
@@ -610,7 +610,7 @@ void get_traffic_statistics(void)
{
printf("(upload) ");
}
- printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);
+ printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);
if_exists(ip,ips,eq(ip->addr,ipaddr));
else
@@ -917,13 +917,13 @@ void parse_ip_log(int argc, char **argv)
if(iplog->traffic)
{
fprintf(f, "%s
%d | \n\
-%s | \n\
+%s | \n\
",
tr_odd_even(), i++, log_url, iplog->name, iplog->name);
if(iplog->lmsid > 0)
{
/*base URL will be configurable soon ... */
- fprintf(f, "%04d\n", lms_url, iplog->lmsid, iplog->lmsid);
+ fprintf(f, "%04d\n", lms_url, iplog->lmsid, iplog->lmsid);
}
else if(iplog->lmsid == 0)
{
@@ -939,9 +939,9 @@ void parse_ip_log(int argc, char **argv)
}
}
fprintf(f,"\
- Total: | \
- %ld GB | \
- %Ld kb/s | \n", total, line);
+ Total: | \
+ %ld GB | \
+ %Ld kb/s | \n", total, line);
fputs("\n", f);
row_odd_even = 0;
@@ -958,7 +958,11 @@ void parse_ip_log(int argc, char **argv)
if_exists(iplog,iplogs,iplog->l>=total/4)
{
fprintf(f,"%s | Top 25%% of traffic | \n", tr_odd_even());
- fprintf(f,"%d | %d %% | %ld G | %d %% | \n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+ fprintf(f,"%d | \n\
+%d %% | \n\
+%ld GB | \n\
+%d %% | \n",
+ iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
}
if_exists(iplog,iplogs,iplog->i==10)
@@ -966,9 +970,9 @@ void parse_ip_log(int argc, char **argv)
fprintf(f,"%sTop 10 downloaders | \n", tr_odd_even());
fprintf(f,"10 | \n\
%d %% | \n\
-%ld G | \n\
+%ld GB | \n\
%d %% | \n",
- (100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+ (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
}
if_exists(iplog,iplogs,iplog->l>=total/2)
@@ -976,7 +980,7 @@ void parse_ip_log(int argc, char **argv)
fprintf(f,"%sTop 50%% of traffic | \n", tr_odd_even());
fprintf(f,"%d | \n\
%d %% | \n\
-%ld G | \n\
+%ld GB | \n\
%d %% | \n",
iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
}
@@ -986,9 +990,9 @@ void parse_ip_log(int argc, char **argv)
fprintf(f,"%sTop 80%% of traffic | \n",tr_odd_even());
fprintf(f,"%d | \n\
%d %% | \n\
-%ld G | \n\
+%ld GB | \n\
%d %% | \n",
- iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+ iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
}
if_exists (iplog,iplogs,iplog->i>=i/5)
@@ -996,15 +1000,19 @@ void parse_ip_log(int argc, char **argv)
fprintf(f,"%sTop 20%% downloaders | \n",tr_odd_even());
fprintf(f,"%d | \n\
%d %% | \n\
-%ld G | \n\
+%ld GB | \n\
%d %% | \n",
- iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+ iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
}
if_exists(iplog,iplogs,iplog->i>=i/4)
{
fprintf(f,"%sTop 25%% downloaders | \n", tr_odd_even());
- fprintf(f,"%d | %d %% | %ld G | %d %% | \n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+ fprintf(f,"%d | \n\
+%d %% | \n\
+%ld GB | \n\
+%d %% | \n",
+ iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
}
if_exists(iplog,iplogs,iplog->i>=i/2)
@@ -1012,20 +1020,25 @@ void parse_ip_log(int argc, char **argv)
fprintf(f,"%sTop 50%% downloaders | \n",tr_odd_even());
fprintf(f,"%d | \n\
%d %% | \n\
-%ld G | %d %% | \n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+%ld GB | \n\
+%d %% | \n",
+ iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
}
if_exists(iplog,iplogs,iplog->i>=4*i/5)
{
fprintf(f,"%sTop 80%% downloaders | \n",tr_odd_even());
- fprintf(f,"%d | %d %% | %ld G | %d %% | \n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+ fprintf(f,"%d | \n\
+%d %% | \n\
+%ld GB | \n\
+%d %% | \n",
+ iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
}
- fprintf(f,"\n\
-All users, all traffic | \n\
-%d | \n\
+ fprintf(f,"All users, all traffic | \n", log_url);
+ fprintf(f,"%d | \n\
100 %% | \n\
-%ld G | \n\
+%ld GB | \n\
100 %% |
\n",i-1,total);
fputs("\n", f);
}
@@ -1640,10 +1653,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
{
fprintf(f, ",\n");
}
- if(ip->traffic || ip->direct || ip->proxy || ip->upload)
+ if( ip->lmsid > 0
+ && (ip->traffic || ip->direct || ip->proxy || ip->upload))
{
- fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",
- ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
+ fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",
+ ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
}
jsoncount++;
}
@@ -1794,7 +1808,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max);
#endif
/* hostnames -------------------------------------- */
- fprintf(f,"%s%d | %s\n",
+ fprintf(f,"%s | %d | %s\n",
tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);
if(use_jquery_popups)
@@ -1803,7 +1817,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
popup_button=0;
for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
{
- fprintf(f," %s\n", log_url, sharedip->name, sharedip->name);
+ fprintf(f," %s\n", log_url, sharedip->name, sharedip->name);
popup_button++;
}
fputs("\n",f);
@@ -1821,7 +1835,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
fputs(" | ",f);
if(ip->lmsid > 0)
{
- fprintf(f,"%04d\n", lms_url, ip->lmsid, ip->lmsid);
+ fprintf(f,"%04d\n", lms_url, ip->lmsid, ip->lmsid);
}
else if(ip->lmsid == 0)
{
@@ -1925,7 +1939,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
if_exists(sum,sums,sum->l>=total_traffic/4)
{
fprintf(f,"%s | Top 25%% of traffic | \n", tr_odd_even());
- fprintf(f,"%d | %d %% | %Lu M | %Ld %% |
\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
+ fprintf(f,"%d | \n\
+%d %% | \n\
+%Lu MB | \n\
+%Ld %% | \n",
+ sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);
}
if_exists(sum,sums,sum->i==10)
@@ -1935,7 +1953,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
%d %% | \n\
%Lu MB | \n\
%Ld %% | \n",
- (100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
+ (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);
}
if_exists(sum,sums,sum->l>=total_traffic/2)
@@ -2002,10 +2020,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
}
- fprintf(f,"All users, all traffic | \n", log_url);
+ fprintf(f,"All users, all traffic | \n", log_url);
fprintf(f,"%d | \n\
100 %% | \n\
-%Lu M | \n\
+%Lu MB | \n\
100 %% |
\n",active_classes,total_traffic);
fputs("\n", f);
@@ -2166,7 +2184,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
if(f)
{
- fprintf(f, "%s %d", ip->addr, ip->mark);
+ fprintf(f, "%s %d\n", ip->addr, ip->mark);
}
}
else
---|