separate mega-module htmlandlogs.c
authorxchaos <xchaos@251d49ef-1d17-4917-a970-b30cf55b089b>
Thu, 11 Oct 2012 22:18:46 +0000 (22:18 +0000)
committerxchaos <xchaos@251d49ef-1d17-4917-a970-b30cf55b089b>
Thu, 11 Oct 2012 22:18:46 +0000 (22:18 +0000)
git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@203 251d49ef-1d17-4917-a970-b30cf55b089b

Makefile
htmlandlogs.c [new file with mode: 0644]
prometheus.c

index 439c7ac..a47818e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ prefix=/usr
 mandir=$(prefix)/share/man
 sbindir=$(prefix)/sbin
 sysconfdir=/etc
-OBJECTS=parsehosts.o parselogs.o ipv4subnets.o json.o prometheus.o
+OBJECTS=parsehosts.o parselogs.o ipv4subnets.o json.o htmlandlogs.o prometheus.o
 HEADERS=cll1-0.6.2.h ipstruct.h
 
 main: prometheus
diff --git a/htmlandlogs.c b/htmlandlogs.c
new file mode 100644 (file)
index 0000000..f624a48
--- /dev/null
@@ -0,0 +1,433 @@
+#include "cll1-0.6.2.h"\r
+#include "ipstruct.h"\r
+#define STRLEN 512\r
+\r
+extern int row_odd_even;\r
+extern int use_jquery_popups;\r
+extern struct IP *ips, *ip, *sharedip;\r
+extern struct Group *groups, *group;\r
+extern struct Keyword *keyword, *defaultkeyword, *keywords;\r
+extern const int highest_priority;\r
+extern const char *version;\r
+extern const char *stats_html_signature;\r
+extern char *jquery_url;\r
+extern int keywordcount;\r
+extern long long int line;\r
+extern int dry_run;\r
+extern int qos_proxy;\r
+extern char *title;\r
+extern char *log_url;\r
+extern int found_lmsid;\r
+extern char *lms_url;\r
+extern char *log_dir;\r
+\r
+const char *tr_odd_even(void);\r
+/* implemented in prometheus.c, shared with parselogs.c */\r
+\r
+void append_log(struct IP *self) /*using global variables*/\r
+{\r
+ char *d, *str;\r
+ FILE *f; \r
+\r
+ date(d); /* this is typical cll1.h macro - prints current date */ \r
+ string(str,STRLEN); \r
+ sprintf(str,"%s/%s.log", log_dir, self->name);\r
+ f=fopen(str,"a");\r
+ if(f > 0)\r
+ {\r
+  fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
+            time(NULL), self->name, self->traffic, self->direct, self->proxy,\r
+            self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/\r
+  fclose(f);\r
+ }\r
+ else\r
+ {\r
+  perror(str);\r
+ }\r
+}\r
+\r
+void write_htmlandlogs(char *html, char *d, int total, int just_preview)\r
+{\r
+ int i;\r
+ char *str;\r
+ FILE *f=fopen(html,"w");\r
+\r
+ string(str,STRLEN); \r
+ if(f > 0)\r
+ {\r
+  int count=1;\r
+  i=0;\r
+\r
+  /*-----------------------------------------------------------------*/\r
+  printf("Writing statistics summary into HTML page %s ...\n", html);\r
+  /*-----------------------------------------------------------------*/\r
+\r
+  if(use_jquery_popups)\r
+  {\r
+   fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);\r
+  }\r
+  fputs("<table class=\"decorated last\">\n\\r
+<caption>Bandwidth classes</caption>\n\\r
+<thead><tr>\n\\r
+<th style=\"text-align: right\">#</th>\n\\r
+<th style=\"text-align: right\">group</th>\n\\r
+<th style=\"text-align: right\">IPs</th>\n\\r
+<th style=\"text-align: right\">requested</th>\n",f);\r
+  fprintf(f,"<th colspan=\"%d\">data limits</th>\n", keywordcount);\r
+  fputs("</tr></thead><tbody>\n",f);\r
+\r
+  row_odd_even = 0;\r
+  for_each(group, groups) \r
+  { \r
+#ifdef DEBUG\r
+   printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired);\r
+#endif\r
+   fprintf(f, "%s<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",\r
+              tr_odd_even(), count, group->min);\r
+   fprintf(f, "<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",\r
+              group->count, group->desired);\r
+\r
+   for_each(keyword, keywords) if(keyword->ip_count)\r
+   {\r
+    fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%d&nbsp;MB</span></td>",\r
+              keyword->html_color, group->min*keyword->data_limit);\r
+   }   \r
+   i += group->desired; \r
+   total += group->count;\r
+   count++; \r
+  }\r
+#ifdef DEBUG\r
+   printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n",\r
+          count, i, i/line);\r
+#endif\r
+   fprintf(f,"</tr></tbody>\n\\r
+<thead><tr>\n\\r
+<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);\r
+   fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);\r
+\r
+   for_each(keyword, keywords) if(keyword->ip_count)\r
+   {\r
+    fprintf(f,"<th style=\"text-align: right\">%d IPs</th>",keyword->ip_count);\r
+   }\r
+   fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n", (int)(0.5+i/line));\r
+   fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n", keywordcount, total);\r
+\r
+   fputs("</thead></table>\n",f);\r
+ }\r
+ else\r
+ {\r
+  perror(html);\r
+ }\r
+\r
+ i=0;\r
+ if(f > 0)\r
+ {\r
+  unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;\r
+  int active_classes=0;\r
+  int colspan=12;\r
+  struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;\r
+  int limit_count=0, prio_count=0;\r
+  int popup_button=0;\r
+\r
+  if(qos_proxy)\r
+  {\r
+   colspan++;\r
+  }\r
+  \r
+  fprintf(f,"<p><table class=\"decorated last\">\n<caption>%s",title);\r
+  fprintf(f," (%s)</caption>\n", d);\r
+  fputs("<thead><tr>\n<th colspan=\"3\">&nbsp;</th>\n",f);\r
+  fputs("<th style=\"text-align: right\">credit</th>\n\\r
+<th style=\"text-align: right\">FUP</th>\n\\r
+<th style=\"text-align: right\">total</th>\n\\r
+<th style=\"text-align: right\">down</th>\n",f);\r
+  if(qos_proxy)\r
+  {\r
+   fputs("<th style=\"text-align: right\">proxy</th>\n",f);\r
+  }\r
+  fputs("<th style=\"text-align: right\">up</th>\n\\r
+<th style=\"text-align: right\">min</th>\n\\r
+<th style=\"text-align: right\">max</th>\n\\r
+<th style=\"text-align: right\">limit</th>\n\\r
+<th>&nbsp;</th>\n\\r
+</tr><tr>\n\\r
+<th style=\"text-align: right\">#</th>\n\\r
+<th>hostname [+sharing]</th>\n\\r
+<th style=\"text-align: right\">LMS</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th>prio</th>\n\\r
+</tr></thead><tbody>\n",f);    \r
+\r
+  row_odd_even = 0;\r
+  for_each(ip,ips) if(!use_jquery_popups || !ip->sharing)\r
+  {\r
+   char *f1="", *f2="";\r
+   i++;\r
+\r
+   if(ip->max < ip->desired) \r
+   { \r
+    f1 = "<span style=\"color:red\">"; \r
+    f2 = "</span>"; \r
+    limit_count++; \r
+   } \r
+   else if(ip->prio > highest_priority+1) \r
+   { \r
+    f1 = "<span style=\"color:brown\">"; \r
+    f2 = "</span>"; \r
+    prio_count++; \r
+   }       \r
+\r
+#ifdef DEBUG\r
+   printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); \r
+#endif\r
+   /* hostnames -------------------------------------- */\r
+   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", \r
+              tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);\r
+\r
+   if(use_jquery_popups)\r
+   {\r
+     fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\r
+     popup_button=0;\r
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+     {\r
+      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
+      popup_button++;\r
+     }\r
+     fputs("</span>\n",f);\r
+     if(popup_button)\r
+     {\r
+      fprintf(f,"<span>[<a class=\"blue\" href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer;\">+%d</a>]</span>",\r
+                i, i, i, popup_button);\r
+     }\r
+   }\r
+   fputs("</td>\n",f);\r
+   /* ----------------------------------------------- */\r
+\r
+   if(found_lmsid)\r
+   {\r
+    fputs("<td style=\"text-align: right\">",f);\r
+    if(ip->lmsid > 0)\r
+    {\r
+     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);\r
+    }\r
+    else if(ip->lmsid == 0)\r
+    {\r
+     fputs("-------",f);\r
+    }\r
+    fputs("</td>\n",f);\r
+   }\r
+   fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->credit);\r
+   fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",\r
+             ip->keyword->html_color,\r
+             ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
+   fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);\r
+\r
+   /* download --------------------------------------- */\r
+   fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);\r
+   if(use_jquery_popups)\r
+   {\r
+     fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+     {\r
+      fprintf(f,"<br />%Lu", sharedip->direct);\r
+     }\r
+     fputs("</span>\n",f);\r
+   }\r
+   fputs("</td>\n",f);\r
+   /* ----------------------------------------------- */\r
+\r
+   if(qos_proxy)\r
+   {\r
+    fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);\r
+   }\r
+   /* upload ---------------------------------------- */\r
+   fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);\r
+   if(use_jquery_popups)\r
+   {\r
+     fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
+     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
+     {\r
+      fprintf(f,"<br />%Lu", sharedip->upload);\r
+     }\r
+     fputs("</span>\n",f);\r
+   }\r
+   fputs("</td>\n",f);\r
+   /* ----------------------------------------------- */\r
+\r
+   fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%s%d%s</td>\n\\r
+<td>%s%d%s</td></tr>\n",\r
+             ip->min, ip->desired, \r
+             f1, ip->max, f2, \r
+             f1, ip->prio, f2);\r
+\r
+   total_traffic+=ip->traffic;\r
+   total_direct+=ip->direct;\r
+   total_proxy+=ip->proxy;\r
+   total_upload+=ip->upload;\r
+   if(ip->traffic>0)\r
+   {\r
+    active_classes++;\r
+    tmp_sum+=ip->traffic;\r
+    create(sum,Sum);\r
+    sum->l=tmp_sum;\r
+    sum->i=active_classes;\r
+    insert(sum,sums,order_by,i);\r
+   }\r
+\r
+   if(!just_preview)\r
+   {\r
+    append_log(ip);\r
+    for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
+    {\r
+     append_log(sharedip);\r
+    }\r
+   }\r
+  }\r
+  fprintf(f,"</tbody><thead><tr>\n\\r
+<th colspan=\"%d\" style=\"text-align: left\">%d CLASSES</th>", colspan-7, i);\r
+  fprintf(f,"<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", total_traffic, total_direct);\r
+  if(qos_proxy)\r
+  {\r
+   fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);\r
+  }\r
+  fprintf(f,"<th style=\"text-align: right\">%Lu</th>", total_upload);\r
+  fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</thead></table>\n",limit_count,prio_count);\r
+\r
+  row_odd_even = 0;\r
+  if(active_classes>10)\r
+  {\r
+   int top20_count=0,top20_perc1=0;\r
+   long long top20_perc2=0;\r
+   unsigned long long top20_sum=0l;\r
+  \r
+   fputs("<a name=\"erp\"></a><p><table class=\"decorated last\"><caption>Enterprise Resource Planning (ERP)</caption>\n",f);\r
+   fputs("<thead><tr>\n\\r
+<th>Analytic category</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\\r
+</tr></thead><tbody>\n",f);\r
+\r
+   if_exists(sum,sums,sum->l>=total_traffic/4)\r
+   {\r
+    fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+              sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r
+   }\r
+   \r
+   if_exists(sum,sums,sum->i==10)\r
+   {\r
+    fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
+    fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+              (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r
+   }\r
+\r
+   if_exists(sum,sums,sum->l>=total_traffic/2)\r
+   {\r
+    fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
+   }\r
+\r
+   if_exists(sum,sums,sum->l>=4*total_traffic/5)\r
+   {\r
+    fprintf(f,"%s<td>Top 80%% of traffic</td>\n", tr_odd_even());\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
+   }\r
+\r
+   if_exists(sum,sums,sum->i>=(active_classes+1)/5)\r
+   {\r
+    fprintf(f,"%s<td>Top 20%% downloaders</td>\n", tr_odd_even());\r
+    top20_count=sum->i;\r
+    top20_perc1=(100*sum->i+50)/active_classes;\r
+    top20_sum=sum->l;\r
+    top20_perc2=(100*sum->l+50)/total_traffic;\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+              top20_count,top20_perc1,top20_sum,top20_perc2);\r
+   }\r
+\r
+   if_exists(sum,sums,sum->i>=(active_classes+1)/4)\r
+   {\r
+    fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
+   }\r
+\r
+   if_exists(sum,sums,sum->i>=(active_classes+1)/2)\r
+   {\r
+    fprintf(f,"%s<td>Top 50%% downloaders</td>\n", tr_odd_even());\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
+   }\r
+\r
+   if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)\r
+   {\r
+    fprintf(f,"%s<td>Top 80%% downloaders</td>\n", tr_odd_even());\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr></tbody>\n",\r
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
+   }\r
+\r
+   fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r
+   fprintf(f,"<th style=\"text-align: right\">%d</th>\n\\r
+<th style=\"text-align: right\">100 %%</th>\n\\r
+<th style=\"text-align: right\">%Lu MB</th>\n\\r
+<th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
+   fputs("</thead></table>\n", f);\r
+\r
+   /* write basic ERP data to log directory */\r
+   if(!just_preview)\r
+   {\r
+    FILE *iplog;\r
+    sprintf(str,"%s/ERP.log",log_dir);\r
+    iplog=fopen(str,"a");\r
+    if(iplog)\r
+    {\r
+     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",\r
+                   time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, \r
+                   active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/\r
+     fclose(iplog);\r
+    }\r
+    else\r
+    {\r
+     perror(str);\r
+    }\r
+   }\r
+  }\r
+\r
+  fprintf(f, stats_html_signature, version);\r
+  fclose(f);\r
+ }\r
+}
\ No newline at end of file
index 814da9e..e068b8e 100644 (file)
@@ -89,7 +89,7 @@ char    *html_log_dir = "/var/www/logs/html/";
 \r
 char      *jquery_url = "http://code.jquery.com/jquery-latest.js";\r
 char         *lms_url = "/lms/?m=customerinfo&amp;id=";\r
-int use_jquery_popups = 1;\r
+int use_jquery_popups = TRUE;\r
 int      row_odd_even = 0; /*<tr class="odd/even"> */\r
  \r
 /* === Configuraration file values defaults - stored in global variables ==== */\r
@@ -97,22 +97,22 @@ int      row_odd_even = 0; /*<tr class="odd/even"> */
 int        filter_type = 1; /*1 mark, 2 classify*/\r
 char             *mark = "MARK";\r
 char    *mark_iptables = "MARK --set-mark ";\r
-int            dry_run = 0; /* preview - use puts() instead of system() */\r
+int            dry_run = FALSE; /* preview - use puts() instead of system() */\r
 char *iptablespreamble = "*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";\r
 FILE    *iptables_file = NULL;\r
-int      enable_credit = 1; /* enable credit file */\r
-int         use_credit = 0; /* use credit file (if enabled)*/\r
+int      enable_credit = TRUE; /* enable credit file */\r
+int         use_credit = FALSE; /* use credit file (if enabled)*/\r
 char            *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */\r
-int       hall_of_fame = 1; /* enable hall of fame */\r
+int       hall_of_fame = TRUE; /* enable hall of fame */\r
 char              *lan = "eth0"; /* LAN interface */\r
 char       *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
 char              *wan = "eth1"; /* WAN/ISP interface */\r
 char       *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
 char         *qos_leaf = "sfq perturb 5"; /* leaf discipline */\r
 char    *qos_free_zone = NULL; /* QoS free zone */\r
-int          qos_proxy = 1; /* include proxy port to QoS */\r
-int        found_lmsid = 0; /* show links to users in LMS information system */\r
-int     include_upload = 1; /* upload+download=total traffic */\r
+int          qos_proxy = TRUE; /* include proxy port to QoS */\r
+int        found_lmsid = FALSE; /* show links to users in LMS information system */\r
+int     include_upload = TRUE; /* upload+download=total traffic */\r
 char         *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */\r
 int         proxy_port = 3128; /* proxy port number */\r
 long long int     line = 1024; /* WAN/ISP download in kbps */\r
@@ -128,8 +128,8 @@ int         burst_main = 64;
 int        burst_group = 32;\r
 int     magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */\r
 int       keywordcount = 0;\r
-int class_count        = 0;\r
-int ip_count           = 0;\r
+int        class_count = 0;\r
+int           ip_count = 0;\r
 /* not yet implemented:\r
 int      fixed_packets = 0; maximum number of pps per IP address (not class!) \r
 int       packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! \r
@@ -157,6 +157,9 @@ void parse_hosts(char *hosts);
 void write_json_traffic(char *json);\r
 /* implemented in json.c */\r
 \r
+void write_htmlandlogs(char *html, char *d, int total, int just_preview);\r
+/* implemented in htmlandlogs.c */\r
+\r
 const char *tr_odd_even(void)\r
 {\r
  row_odd_even = 1 - row_odd_even;\r
@@ -568,27 +571,6 @@ char *parse_datafile_line(char *str)
  }\r
 }\r
 \r
-void append_log(struct IP *self) /*using global variables*/\r
-{\r
- char *d, *str;\r
- FILE *f; \r
-\r
- date(d); /* this is typical cll1.h macro - prints current date */ \r
- string(str,STRLEN); \r
- sprintf(str,"%s/%s.log", log_dir, self->name);\r
- f=fopen(str,"a");\r
- if(f > 0)\r
- {\r
-  fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
-            time(NULL), self->name, self->traffic, self->direct, self->proxy,\r
-            self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/\r
-  fclose(f);\r
- }\r
- else\r
- {\r
-  perror(str);\r
- }\r
-}\r
 \r
 /*-----------------------------------------------------------------*/\r
 /* Are you looking for int main(int argc, char **argv) ? :-))      */\r
@@ -601,14 +583,14 @@ program
  char *str, *ptr, *d;        /* LET A$=B$ :-) */\r
  char *substring;\r
 \r
- int parent=1;\r
- int just_flush=FALSE;       /* deactivates all previous actions */\r
- int nodelay=FALSE;\r
- int just_preview=FALSE;     /* preview - generate just stats */\r
- int start_shaping=FALSE;    /* apply FUP - requires classmap file */\r
- int just_logs=FALSE;        /* just parse logs */\r
- int run=FALSE;\r
- int total=0;\r
+ int parent        = 1;\r
+ int just_flush    = FALSE;       /* deactivates all previous actions */\r
+ int nodelay       = FALSE;\r
+ int just_preview  = FALSE;       /* preview - generate just stats */\r
+ int start_shaping = FALSE;       /* apply FUP - requires classmap file */\r
+ int just_logs     = FALSE;       /* just parse logs */\r
+ int run           = FALSE;\r
+ int total         = 0;\r
  \r
  char *chain_forward, *chain_postrouting;\r
  char *althosts=NULL;\r
@@ -1100,384 +1082,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   write_json_traffic(json_traffic);\r
  }\r
 \r
- f=fopen(html,"w");\r
- if(f > 0)\r
- {\r
-  int count=1;\r
-  i=0;\r
-\r
-  /*-----------------------------------------------------------------*/\r
-  printf("Sorting data and generating statistics page %s ...\n", html);\r
-  /*-----------------------------------------------------------------*/\r
-\r
-  if(use_jquery_popups)\r
-  {\r
-   fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);\r
-  }\r
-  fputs("<table class=\"decorated last\">\n\\r
-<caption>Bandwidth classes</caption>\n\\r
-<thead><tr>\n\\r
-<th style=\"text-align: right\">#</th>\n\\r
-<th style=\"text-align: right\">group</th>\n\\r
-<th style=\"text-align: right\">IPs</th>\n\\r
-<th style=\"text-align: right\">requested</th>\n",f);\r
-  fprintf(f,"<th colspan=\"%d\">data limits</th>\n", keywordcount);\r
-  fputs("</tr></thead><tbody>\n",f);\r
-\r
-  row_odd_even = 0;\r
-  for_each(group, groups) \r
-  { \r
-#ifdef DEBUG\r
-   printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired);\r
-#endif\r
-   fprintf(f, "%s<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",\r
-              tr_odd_even(), count, group->min);\r
-   fprintf(f, "<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",\r
-              group->count, group->desired);\r
-\r
-   for_each(keyword, keywords) if(keyword->ip_count)\r
-   {\r
-    fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%d&nbsp;MB</span></td>",\r
-              keyword->html_color, group->min*keyword->data_limit);\r
-   }   \r
-   i += group->desired; \r
-   total += group->count;\r
-   count++; \r
-  }\r
-#ifdef DEBUG\r
-   printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n",\r
-          count, i, i/line);\r
-#endif\r
-   fprintf(f,"</tr></tbody>\n\\r
-<thead><tr>\n\\r
-<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);\r
-   fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);\r
-\r
-   for_each(keyword, keywords) if(keyword->ip_count)\r
-   {\r
-    fprintf(f,"<th style=\"text-align: right\">%d IPs</th>",keyword->ip_count);\r
-   }\r
-   fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n", (int)(0.5+i/line));\r
-   fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n", keywordcount, total);\r
-\r
-   fputs("</thead></table>\n",f);\r
- }\r
- else if(!dry_run && !just_flush)\r
- {\r
-  perror(html);\r
- }\r
-\r
- i=0;\r
- if(f > 0)\r
- {\r
-  unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;\r
-  int active_classes=0;\r
-  int colspan=12;\r
-  struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;\r
-  int limit_count=0, prio_count=0;\r
-  int popup_button=0;\r
-\r
-  if(qos_proxy)\r
-  {\r
-   colspan++;\r
-  }\r
-  \r
-  fprintf(f,"<p><table class=\"decorated last\">\n<caption>%s",title);\r
-  fprintf(f," (%s)</caption>\n", d);\r
-  fputs("<thead><tr>\n<th colspan=\"3\">&nbsp;</th>\n",f);\r
-  fputs("<th style=\"text-align: right\">credit</th>\n\\r
-<th style=\"text-align: right\">FUP</th>\n\\r
-<th style=\"text-align: right\">total</th>\n\\r
-<th style=\"text-align: right\">down</th>\n",f);\r
-  if(qos_proxy)\r
-  {\r
-   fputs("<th style=\"text-align: right\">proxy</th>\n",f);\r
-  }\r
-  fputs("<th style=\"text-align: right\">up</th>\n\\r
-<th style=\"text-align: right\">min</th>\n\\r
-<th style=\"text-align: right\">max</th>\n\\r
-<th style=\"text-align: right\">limit</th>\n\\r
-<th>&nbsp;</th>\n\\r
-</tr><tr>\n\\r
-<th style=\"text-align: right\">#</th>\n\\r
-<th>hostname [+sharing]</th>\n\\r
-<th style=\"text-align: right\">LMS</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">kb/s</th>\n\\r
-<th style=\"text-align: right\">kb/s</th>\n\\r
-<th style=\"text-align: right\">kb/s</th>\n\\r
-<th>prio</th>\n\\r
-</tr></thead><tbody>\n",f);    \r
-\r
-  row_odd_even = 0;\r
-  for_each(ip,ips) if(!use_jquery_popups || !ip->sharing)\r
-  {\r
-   char *f1="", *f2="";\r
-   i++;\r
-\r
-   if(ip->max < ip->desired) \r
-   { \r
-    f1="<span style=\"color:red\">"; \r
-    f2="</span>"; \r
-    limit_count++; \r
-   } \r
-   else if(ip->prio > highest_priority+1) \r
-   { \r
-    f1="<span style=\"color:brown\">"; \r
-    f2="</span>"; \r
-    prio_count++; \r
-   }       \r
-\r
-#ifdef DEBUG\r
-   printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); \r
-#endif\r
-   /* hostnames -------------------------------------- */\r
-   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", \r
-              tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);\r
-\r
-   if(use_jquery_popups)\r
-   {\r
-     fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\r
-     popup_button=0;\r
-     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
-     {\r
-      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
-      popup_button++;\r
-     }\r
-     fputs("</span>\n",f);\r
-     if(popup_button)\r
-     {\r
-      fprintf(f,"<span>[<a class=\"blue\" href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer;\">+%d</a>]</span>",\r
-                i, i, i, popup_button);\r
-     }\r
-   }\r
-   fputs("</td>\n",f);\r
-   /* ----------------------------------------------- */\r
-\r
-   if(found_lmsid)\r
-   {\r
-    fputs("<td style=\"text-align: right\">",f);\r
-    if(ip->lmsid > 0)\r
-    {\r
-     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);\r
-    }\r
-    else if(ip->lmsid == 0)\r
-    {\r
-     fputs("-------",f);\r
-    }\r
-    fputs("</td>\n",f);\r
-   }\r
-   fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->credit);\r
-   fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",\r
-             ip->keyword->html_color,\r
-             ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
-   fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);\r
-\r
-   /* download --------------------------------------- */\r
-   fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);\r
-   if(use_jquery_popups)\r
-   {\r
-     fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
-     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
-     {\r
-      fprintf(f,"<br />%Lu", sharedip->direct);\r
-     }\r
-     fputs("</span>\n",f);\r
-   }\r
-   fputs("</td>\n",f);\r
-   /* ----------------------------------------------- */\r
-\r
-   if(qos_proxy)\r
-   {\r
-    fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);\r
-   }\r
-   /* upload ---------------------------------------- */\r
-   fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);\r
-   if(use_jquery_popups)\r
-   {\r
-     fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
-     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
-     {\r
-      fprintf(f,"<br />%Lu", sharedip->upload);\r
-     }\r
-     fputs("</span>\n",f);\r
-   }\r
-   fputs("</td>\n",f);\r
-   /* ----------------------------------------------- */\r
-\r
-   fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%s%d%s</td>\n\\r
-<td>%s%d%s</td></tr>\n",\r
-             ip->min, ip->desired, \r
-             f1, ip->max, f2, \r
-             f1, ip->prio, f2);\r
-\r
-   total_traffic+=ip->traffic;\r
-   total_direct+=ip->direct;\r
-   total_proxy+=ip->proxy;\r
-   total_upload+=ip->upload;\r
-   if(ip->traffic>0)\r
-   {\r
-    active_classes++;\r
-    tmp_sum+=ip->traffic;\r
-    create(sum,Sum);\r
-    sum->l=tmp_sum;\r
-    sum->i=active_classes;\r
-    insert(sum,sums,order_by,i);\r
-   }\r
-\r
-   if(!just_preview)\r
-   {\r
-    append_log(ip);\r
-    for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
-    {\r
-     append_log(sharedip);\r
-    }\r
-   }\r
-  }\r
-  fprintf(f,"</tbody><thead><tr>\n\\r
-<th colspan=\"%d\" style=\"text-align: left\">%d CLASSES</th>", colspan-7, i);\r
-  fprintf(f,"<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", total_traffic, total_direct);\r
-  if(qos_proxy)\r
-  {\r
-   fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);\r
-  }\r
-  fprintf(f,"<th style=\"text-align: right\">%Lu</th>", total_upload);\r
-  fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</thead></table>\n",limit_count,prio_count);\r
-\r
-  row_odd_even = 0;\r
-  if(active_classes>10)\r
-  {\r
-   int top20_count=0,top20_perc1=0;\r
-   long long top20_perc2=0;\r
-   unsigned long long top20_sum=0l;\r
-  \r
-   fputs("<a name=\"erp\"></a><p><table class=\"decorated last\"><caption>Enterprise Resource Planning (ERP)</caption>\n",f);\r
-   fputs("<thead><tr>\n\\r
-<th>Analytic category</th>\n\\r
-<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\\r
-<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\\r
-</tr></thead><tbody>\n",f);\r
-\r
-   if_exists(sum,sums,sum->l>=total_traffic/4)\r
-   {\r
-    fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r
-    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
-              sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r
-   }\r
-   \r
-   if_exists(sum,sums,sum->i==10)\r
-   {\r
-    fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
-              (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r
-   }\r
-\r
-   if_exists(sum,sums,sum->l>=total_traffic/2)\r
-   {\r
-    fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
-    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
-              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
-   }\r
-\r
-   if_exists(sum,sums,sum->l>=4*total_traffic/5)\r
-   {\r
-    fprintf(f,"%s<td>Top 80%% of traffic</td>\n", tr_odd_even());\r
-    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
-              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
-   }\r
-\r
-   if_exists(sum,sums,sum->i>=(active_classes+1)/5)\r
-   {\r
-    fprintf(f,"%s<td>Top 20%% downloaders</td>\n", tr_odd_even());\r
-    top20_count=sum->i;\r
-    top20_perc1=(100*sum->i+50)/active_classes;\r
-    top20_sum=sum->l;\r
-    top20_perc2=(100*sum->l+50)/total_traffic;\r
-    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
-              top20_count,top20_perc1,top20_sum,top20_perc2);\r
-   }\r
-\r
-   if_exists(sum,sums,sum->i>=(active_classes+1)/4)\r
-   {\r
-    fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
-              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
-   }\r
-\r
-   if_exists(sum,sums,sum->i>=(active_classes+1)/2)\r
-   {\r
-    fprintf(f,"%s<td>Top 50%% downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
-              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
-   }\r
-\r
-   if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)\r
-   {\r
-    fprintf(f,"%s<td>Top 80%% downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr></tbody>\n",\r
-              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
-   }\r
-\r
-   fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r
-   fprintf(f,"<th style=\"text-align: right\">%d</th>\n\\r
-<th style=\"text-align: right\">100 %%</th>\n\\r
-<th style=\"text-align: right\">%Lu MB</th>\n\\r
-<th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
-   fputs("</thead></table>\n", f);\r
-\r
-   /* write basic ERP data to log directory */\r
-   if(!just_preview)\r
-   {\r
-    FILE *iplog;\r
-    sprintf(str,"%s/ERP.log",log_dir);\r
-    iplog=fopen(str,"a");\r
-    if(iplog)\r
-    {\r
-     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",\r
-                   time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, \r
-                   active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/\r
-     fclose(iplog);\r
-    }\r
-    else\r
-    {\r
-     perror(str);\r
-    }\r
-   }\r
-  }\r
-\r
-  fprintf(f, stats_html_signature, version);\r
-  fclose(f);\r
- }\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Writing statistics into HTML page %s ...\n", html);\r
+ /*-----------------------------------------------------------------*/\r
+ write_htmlandlogs(json_traffic,d,total, just_preview);\r
 \r
  if(just_preview)\r
  {\r
This page took 0.456451 seconds and 4 git commands to generate.