X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=b290bf70d5977f521a8fb19fb5465c2f13c55b4a;hb=32c1649d2a23c7838890b2eb9f46b21295b56f04;hp=f158e3257dd5a9a8bbdf084f93ef80449d8971ca;hpb=60a8251d24edd7db28a2490a5cbc8bc98d305eed;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index f158e32..b290bf7 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
 
-/* Modified by: xChaos, 20110428
+/* Modified by: xChaos, 20111130
                  ludva, 20080415
  
    Prometheus QoS is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@
 
 #include "cll1-0.6.2.h"
 
-const char *version = "0.8.3"; 
+const char *version = "0.8.3-b";
 
 /* 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. */
@@ -620,7 +620,7 @@ void save_line(char *line)
 
 void run_restore(void)
 {
- char *restor, *str;
+ char *restor;
  string(restor,STRLEN);
 
  /*-----------------------------------------------------------------*/
@@ -867,7 +867,7 @@ void parse_ip_log(int argc, char **argv)
 
   if(i>10)
   {
-   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Research and Planning (ERP)</th></tr>\n",f);
+   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Resource Planning (ERP)</th></tr>\n",f);
    fputs("<tr><td>Analytic category</td>\n",f);
    fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);
 
@@ -947,6 +947,7 @@ program
  int just_preview=FALSE;                /* preview - generate just stats */
  int just_logs=FALSE;                   /* just parse logs */
  int run=FALSE;
+ int total=0;
  
  char *chain_forward, *chain_postrouting;
  char *althosts=NULL;
@@ -1502,7 +1503,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  if(f)
  {
-  int total=0;
+
   int count=1;
   i=0;
 
@@ -1510,6 +1511,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   printf("Sorting data and generating statistics page %s ...\n",ptr);
   /*-----------------------------------------------------------------*/
 
+  fputs("<script type=\"text/javascript\" src=\"/jquery.js\"></script>\n",f);
   fputs("<table border>\n<tr><th align=\"right\">#</th><th align=\"right\">group</th><th align=\"right\">IPs</th><th align=\"right\">requested</th>\n",f);
   fprintf(f,"<th colspan=\"%d\">data limits</th>\n",keywordcount);
   fputs("</tr>\n",f);
@@ -1524,7 +1526,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
    for_each(keyword,keywords)
    {
-    fprintf(f,"<td align=\"right\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit);
+    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d M</span></td>",keyword->html_color,group->min*keyword->data_limit);
    }   
    i+=group->desired; 
    total+=group->count;
@@ -1551,13 +1553,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  i=1;
  if(f)
  {
-  unsigned long long total=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;
+  unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;
   int active_classes=0;
-  int colspan;
+  int colspan=11;
   FILE *iplog;
   struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;
+  int limit_count=0, prio_count=0;
+  int popup_button=0;
 
-  colspan=11;
   if(qos_proxy)
   {
    colspan++;
@@ -1593,19 +1596,38 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    char *f1="", *f2="";
    if(ip->max<ip->desired)
    {
-    f1="<font color=\"red\">";
-    f2="</font>";
+    f1="<span style=\"color:red\">";
+    f2="</span>";
+    limit_count++;
    }
    else if(ip->prio>highest_priority+1)
    {
-    f1="<font color=\"brown\">";
-    f2="</font>";
+    f1="<span style=\"color:brown\">";
+    f2="</span>";
+    prio_count++;
    }
 
 #ifdef DEBUG
    printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); 
 #endif
-   fprintf(f,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a></td>\n", ip->name, i, log_url, ip->name, ip->name);
+   /* hostnames -------------------------------------- */
+   fprintf(f,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a>\n", ip->name, i, log_url, ip->name, ip->name);   
+   fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);
+   popup_button=0;
+   for_selected(sharedip,ips,eq(ip->name,sharedip->sharing))
+   {
+    fprintf(f,"<br /><a href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
+    popup_button=1;
+   }
+   fputs("</span>\n",f);
+   if(popup_button)
+   {
+    fprintf(f,"<span>[<a href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer; text-decoration:none;\">+</a>]</span>",
+              i, i, i);
+   }
+   fputs("</td>\n",f);
+   /* ----------------------------------------------- */
+
    if(found_lmsid)
    {
     fputs("<td align=\"right\">",f);
@@ -1618,20 +1640,41 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     {
      fputs("-------",f);
     }
-    fputs("</td>\n",f);    
+    fputs("</td>\n",f);
    }
    fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->credit);
-   fprintf(f,"<td align=\"right\"><font color=\"#%s\">%Lu M</font></td>",
-             ip->keyword->html_color, ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
-   fprintf(f,"<td align=\"right\">%s%Lu M%s</td><td align=\"right\">%Lu M</td>\n", f1, ip->traffic, f2, ip->direct);
+   fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%Lu M</span></td>",
+             ip->keyword->html_color,
+             ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
+   fprintf(f,"<td align=\"right\">%s%Lu M%s",f1, ip->traffic, f2);
+
+   /* download --------------------------------------- */
+   fprintf(f,"</td><td align=\"right\">%Lu M", ip->direct);
+   fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);
+   for_selected(sharedip,ips,eq(ip->name,sharedip->sharing))
+   {
+    fprintf(f,"<br />%Lu M", sharedip->direct);
+   }
+   fputs("</span></td>\n",f);
+   /* ----------------------------------------------- */
+
    if(qos_proxy)
    {
     fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->proxy);
    }
-   fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->upload);
+   /* upload ---------------------------------------- */
+   fprintf(f,"<td align=\"right\">%Lu M", ip->upload);
+   fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);
+   for_selected(sharedip,ips,eq(ip->name,sharedip->sharing))
+   {
+    fprintf(f,"<br />%Lu M", sharedip->upload);
+   }
+   fputs("</span></td>\n",f);
+   /* ----------------------------------------------- */
+
    fprintf(f,"<td align=\"right\">%d k</td><td align=\"right\">%d k</td><td align=\"right\">%s%d k%s</td><td>%s%d%s</td></tr>\n",
              ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);
-   total+=ip->traffic;
+   total_traffic+=ip->traffic;
    total_direct+=ip->direct;
    total_proxy+=ip->proxy;
    total_upload+=ip->upload;
@@ -1658,17 +1701,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      fclose(iplog);
     }
    }
-
   }
   fprintf(f,"<tr><th colspan=\"%d\" align=\"left\">SUMMARY:</td>",colspan-7);
-  fprintf(f,"<th align=\"right\">%Lu M</th>\
-  <th align=\"right\">%Lu M</th>\n", total, total_direct);
+  fprintf(f,"<th align=\"right\">%Lu M</th><th align=\"right\">%Lu M</th>\n", total_traffic, total_direct);
   if(qos_proxy)
   {
    fprintf(f,"<th align=\"right\">%Lu M</th>\n", total_proxy);
   }
   fprintf(f,"<th align=\"right\">%Lu M</th>", total_upload);
-  fputs("<td colspan=\"4\"></td></th>\n</table>\n",f);
+  fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">FUP-LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</table>\n",limit_count,prio_count);
 
   if(active_classes>10)
   {
@@ -1676,32 +1717,32 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    long long top20_perc2=0;
    unsigned long long top20_sum=0l;
   
-   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Research and Planning (ERP)</th></tr>\n",f);
+   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Resource Planning (ERP)</th></tr>\n",f);
    fputs("<tr><td>Analytic category</td>\n",f);
    fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);
 
-   if_exists(sum,sums,sum->l>=total/4)
+   if_exists(sum,sums,sum->l>=total_traffic/4)
    {
     fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);
+    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
    
    if_exists(sum,sums,sum->i==10)
    {
     fprintf(f,"<tr><td>Top 10 downloaders</td>\n");
-    fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);
+    fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   if_exists(sum,sums,sum->l>=total/2)
+   if_exists(sum,sums,sum->l>=total_traffic/2)
    {
     fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);
+    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   if_exists(sum,sums,sum->l>=4*total/5)
+   if_exists(sum,sums,sum->l>=4*total_traffic/5)
    {
     fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);
+    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
    if_exists(sum,sums,sum->i>=(active_classes+1)/5)
@@ -1710,41 +1751,42 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     top20_count=sum->i;
     top20_perc1=(100*sum->i+50)/active_classes;
     top20_sum=sum->l;
-    top20_perc2=(100*sum->l+50)/total;
+    top20_perc2=(100*sum->l+50)/total_traffic;
     fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",top20_count,top20_perc1,top20_sum,top20_perc2);
    }
 
    if_exists(sum,sums,sum->i>=(active_classes+1)/4)
    {
     fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);
+    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
    if_exists(sum,sums,sum->i>=(active_classes+1)/2)
    {
     fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);
+    fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
    if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)
    {
     fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);
+    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   fprintf(f,"<tr><td>All users, all traffic</td>\n");
-   fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%Lu M</th><th align=\"right\">100 %%</th></tr>\n",active_classes,total);
+   fprintf(f,"<tr><td><a href=\"%sERP.log\">All users, all traffic</a></td>\n", log_url);
+   fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%Lu M</th><th align=\"right\">100 %%</th></tr>\n",active_classes,total_traffic);
    fputs("</table>\n", f);
 
-   /*write basic ERP data to log directory*/
+   /* write basic ERP data to log directory */
    if(!just_preview)
    {
     sprintf(str,"%s/ERP.log",log_dir);
     iplog=fopen(str,"a");
     if(iplog)
     {
-     fprintf(iplog,"%ld\t%d\t%d %%\t%Lu\t%Ld %%\t%d\t%Lu\t%s",
-                    time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, active_classes, total, d); /* d = date*/
+     fprintf(iplog,"%ld\t%d\t%d %%\t%Lu M\t%Ld %%\tACTIVE %d\tTRAFFIC %Lu M\tCLASSES %d\tFUP-LIMIT %d\tLOW-PRIO %d\t%s",
+                   time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, 
+                   active_classes, total_traffic, total, limit_count, prio_count, d); /* d = date*/
      fclose(iplog);
     }
    }