X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=780b15858c8dadec585d28a63b31ffe8c0350205;hb=0db8e99319ee2e9798ba7fb58a7666791cf81414;hp=e068b8ef5f9011a1ad913611fdbca9ea7569a752;hpb=9a56ab25128074e581fa5f69bac8afa2fb939c82;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index e068b8e..780b158 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -980,13 +980,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     
     for_each(ip, ips) if(ip->min == group->min && ip->max > ip->min)
     {
-     if(    ip->keyword->data_limit && !ip->fixedprio 
-         && (   ip->traffic>ip->credit
-              + (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))) )
+     ip->realquota=ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20));
+     if(     ip->keyword->data_limit 
+         and not ip->fixedprio 
+         and ip->traffic > ip->realquota )
      {
-      if(group_rate<ip->max)
+      if(group_rate < ip->max)
       {
-       ip->max=group_rate;
+       ip->max = group_rate;
       }
       group_rate+=magic_treshold;
       ip->prio=lowest_priority;
@@ -1085,7 +1086,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/
  printf("Writing statistics into HTML page %s ...\n", html);
  /*-----------------------------------------------------------------*/
- write_htmlandlogs(json_traffic,d,total, just_preview);
+ write_htmlandlogs(html, d,total, just_preview);
 
  if(just_preview)
  {