From 3365c6a28452f26ca278fc73bf0c6a0393418224 Mon Sep 17 00:00:00 2001 From: xchaos Date: Thu, 1 Dec 2011 18:17:27 +0000 Subject: [PATCH]   git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@158 251d49ef-1d17-4917-a970-b30cf55b089b --- prometheus.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/prometheus.c b/prometheus.c index 561e2bd..ed4661d 100644 --- a/prometheus.c +++ b/prometheus.c @@ -864,7 +864,7 @@ void parse_ip_log(int argc, char **argv) { fputs("-------",f); } - fprintf(f, "%ld M%ld G%ld kbps\n", + fprintf(f, "%ld M%ld G%ld kbps\n", iplog->traffic, iplog->traffic>>10, iplog->guaranted); total+=iplog->traffic>>10; iplog->i=i; @@ -1536,14 +1536,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); #ifdef DEBUG printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired); #endif - fprintf(f,"%d%d k", + fprintf(f,"%d%d k", count, group->min); - fprintf(f,"%d%d k", + fprintf(f,"%d%d k", group->count, group->desired); for_each(keyword, keywords) { - fprintf(f,"%d M", + fprintf(f,"%d M", keyword->html_color, group->min*keyword->data_limit); } i += group->desired; @@ -1668,20 +1668,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } fputs("\n",f); } - fprintf(f,"%Lu M\n", ip->credit); - fprintf(f,"%Lu M", + fprintf(f,"%Lu M\n", ip->credit); + fprintf(f,"%Lu M", ip->keyword->html_color, ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))); - fprintf(f,"%s%Lu M%s", f1, ip->traffic, f2); + fprintf(f,"%s%Lu M%s", f1, ip->traffic, f2); /* download --------------------------------------- */ - fprintf(f,"%Lu M", ip->direct); + fprintf(f,"%Lu M", ip->direct); if(use_jquery_popups) { fprintf(f,"",i); for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing)) { - fprintf(f,"
%Lu M", sharedip->direct); + fprintf(f,"
%Lu M", sharedip->direct); } fputs("
\n",f); } @@ -1690,23 +1690,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(qos_proxy) { - fprintf(f,"%Lu M\n", ip->proxy); + fprintf(f,"%Lu M\n", ip->proxy); } /* upload ---------------------------------------- */ - fprintf(f,"%Lu M", ip->upload); + fprintf(f,"%Lu M", ip->upload); if(use_jquery_popups) { fprintf(f,"",i); for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing)) { - fprintf(f,"
%Lu M", sharedip->upload); + fprintf(f,"
%Lu M", sharedip->upload); } fputs("
\n",f); } fputs("\n",f); /* ----------------------------------------------- */ - fprintf(f,"%d k%d k%s%d k%s%s%d%s\n", + fprintf(f,"%d k%d k%s%d k%s%s%d%s\n", ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2); total_traffic+=ip->traffic; @@ -1737,12 +1737,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } } fprintf(f,"%d CLASSES", colspan-7, i); - fprintf(f,"%Lu M%Lu M\n", total_traffic, total_direct); + fprintf(f,"%Lu M%Lu M\n", total_traffic, total_direct); if(qos_proxy) { - fprintf(f,"%Lu M\n", total_proxy); + fprintf(f,"%Lu M\n", total_proxy); } - fprintf(f,"%Lu M", total_upload); + fprintf(f,"%Lu M", total_upload); fprintf(f,"FUP-LIMIT %dx LOW-PRIO %dx\n\n",limit_count,prio_count); if(active_classes>10) -- 2.30.2