X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=8c70bb0b86e7340f2feff6f13b3a1c47302fc75e;hp=d241618fcc351c084294e9e9e293cc637bd6617e;hb=1f13bb8e59cd4f0c1a7bdfcde5599e5c0188d6c2;hpb=1c004f157fcfa04aa9b9361266fb2b84645c6f33

diff --git a/prometheus.c b/prometheus.c
index d241618..8c70bb0 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -40,7 +40,7 @@ const char *version = "0.8.3-d";
 /* 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 = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\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<td style=\"text-align: right\">%d</td>\n\
-<td style=\"text-align: left\"><a class=\"blue\" href=\"%s%s.log\">%s</td>\n\
+<td style=\"text-align: left\"><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</td>\n\
 <td style=\"text-align: right\">", 
                tr_odd_even(), i++, log_url, iplog->name, iplog->name);  
     if(iplog->lmsid > 0)
     {
      /*base URL will be configurable soon ... */
-     fprintf(f, "<a  class=\"blue\"  href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);
+     fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\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,"</tbody><thead><tr>\
-  <td colspan=\"4\" style=\"text-align: left\">Total:</td>\
-  <td style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></td>\
-  <td style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></td></tr>\n", total, line);
+  <th colspan=\"3\" style=\"text-align: left\">Total:</th>\
+  <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\
+  <th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th></tr>\n", total, line);
   fputs("</thead></table>\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<td>Top 25%% of traffic</td>\n", tr_odd_even());
-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\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,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\
 <td style=\"text-align: right\">%d %%</td>\n\
-<td style=\"text-align: right\">%ld G</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
 <td style=\"text-align: right\">%d %%</td></tr>\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,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
 <td style=\"text-align: right\">%d %%</td>\n\
-<td style=\"text-align: right\">%ld G</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
 <td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\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,"%s<td>Top 80%% of traffic</td>\n",tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
 <td style=\"text-align: right\">%d %%</td>\n\
-<td style=\"text-align: right\">%ld G</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
 <td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\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,"%s<td>Top 20%% downloaders</td>\n",tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
 <td style=\"text-align: right\"><strong>%d %%</strong></td>\n\
-<td style=\"text-align: right\">%ld G</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
 <td style=\"text-align: right\">%d %%</td></tr>\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,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());
-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\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,"%s<td>Top 50%% downloaders</td>\n",tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
 <td style=\"text-align: right\"><strong>%d %%</strong></td>\n\
-<td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\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,"%s<td>Top 80%% downloaders</td>\n",tr_odd_even());
-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\n",
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
 
-   fprintf(f,"</tbody><thead><tr>\n\
-<th>All users, all traffic</th>\n\
-<th style=\"text-align: right\">%d</th>\n\
+   fprintf(f,"</tbody><thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
+   fprintf(f,"<th style=\"text-align: right\">%d</th>\n\
 <th style=\"text-align: right\">100 %%</th>\n\
-<th style=\"text-align: right\">%ld G</th>\n\
+<th style=\"text-align: right\">%ld GB</th>\n\
 <th style=\"text-align: right\">100 %%</th></tr>\n",i-1,total);
    fputs("</thead></table>\n", f);
   }
@@ -1640,7 +1653,8 @@ 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);
@@ -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<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", 
+   fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\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,"<br /><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
+      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
       popup_button++;
      }
      fputs("</span>\n",f);
@@ -1821,7 +1835,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     fputs("<td style=\"text-align: right\">",f);
     if(ip->lmsid > 0)
     {
-     fprintf(f,"<a class=\"blue\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
+     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
     }
     else if(ip->lmsid == 0)
     {
@@ -1861,10 +1875,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
      {
       fprintf(f,"<br />%Lu", sharedip->upload);
-      if(!just_preview)
-      {
-       append_log(sharedip);
-      }
      }
      fputs("</span>\n",f);
    }
@@ -1896,6 +1906,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    if(!just_preview)
    {
     append_log(ip);
+    for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
+    {
+     append_log(sharedip);
+    }
    }
   }
   fprintf(f,"</tbody><thead><tr>\n\
@@ -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<td>Top 25%% of traffic</td>\n", tr_odd_even());
-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%Lu M</td><td style=\"text-align: right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<td style=\"text-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)
@@ -1935,7 +1953,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 <td style=\"text-align: right\">%d %%</td>\n\
 <td style=\"text-align: right\">%Lu MB</td>\n\
 <td style=\"text-align: right\">%Ld %%</td></tr>\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,"<tr><thead><th><a class=\"blue\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
+   fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
    fprintf(f,"<th style=\"text-align: right\">%d</th>\n\
 <th style=\"text-align: right\">100 %%</th>\n\
-<th style=\"text-align: right\">%Lu M</th>\n\
+<th style=\"text-align: right\">%Lu MB</th>\n\
 <th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);
    fputs("</thead></table>\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