X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=htmlandlogs.c;h=70377848b7c501bd89f458541495d637d9ecf941;hb=68184e0de9058fbf917d3c4b8fd287f1c4588b4e;hp=3820ae462297c5a5059e84c07fabd8c7e3632ff7;hpb=64b2d1255780905c78973df33145c93ee5613c9c;p=svn%2FPrometheus-QoS%2F.git diff --git a/htmlandlogs.c b/htmlandlogs.c index 3820ae4..7037784 100644 --- a/htmlandlogs.c +++ b/htmlandlogs.c @@ -130,7 +130,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview) int active_classes = 0; // int colspan = 14; struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums = NULL; - int limit_count = 0, prio_count = 0; + int agreg_count = 0, limit_count = 0, prio_count = 0; int popup_button = 0; /* IPv6 vs. IPv4 stats */ unsigned long long pkts4 =0, pkts6 = 0, bytes4 = 0, bytes6 = 0; @@ -197,7 +197,13 @@ $(\'#pktsup_\'+n).show();\ char *f1="", *f2=""; i++; - if(ip->max < ip->desired) + if(ip->aggregated > 1) + { + f1 = ""; + f2 = ""; + agreg_count++; + } + else if(ip->max < ip->desired) { f1 = ""; f2 = ""; @@ -259,7 +265,7 @@ style=\"cursor: pointer;\">+%d]", } else if(ip->lmsid == 0) { - fputs("-------",f); + fputs("------",f); } fputs("\n",f); } @@ -419,9 +425,11 @@ style=\"cursor: pointer;\">+%d]", */ fprintf(f, "%Lu%d", total_direct, total_pktdown/i); - fprintf(f, "LIMIT %dx \ -LOW-PRIO %dx\n\n", - limit_count, prio_count); + fprintf(f, "\ +AGR %dx \ +FUP %dx \ +PRIO %dx\n\n", + agreg_count, limit_count, prio_count); if(ip6prefix) {