more information in json output (for mailing system)

[svn/Prometheus-QoS/.git] / prometheus.c

diff --git a/prometheus.c b/prometheus.c
index e068b8ef5f9011a1ad913611fdbca9ea7569a752..2eda2592210dfd88b0e774a7e32278ea6dcde8c3 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -980,13 +980,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     \r
     for_each(ip, ips) if(ip->min == group->min && ip->max > ip->min)\r
     {\r
     \r
     for_each(ip, ips) if(ip->min == group->min && ip->max > ip->min)\r
     {\r

-     if(    ip->keyword->data_limit && !ip->fixedprio \r
-         && (   ip->traffic>ip->credit\r
-              + (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))) )\r
+     ip->realquota=ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20));\r
+     if(     ip->keyword->data_limit \r
+         and not ip->fixedprio \r
+         and ip->traffic > ip->realquota )\r

      {\r
      {\r

-      if(group_rate<ip->max)\r
+      if(group_rate < ip->max)\r

       {\r
       {\r

-       ip->max=group_rate;\r
+       ip->max = group_rate;\r

       }\r
       group_rate+=magic_treshold;\r
       ip->prio=lowest_priority;\r
       }\r
       group_rate+=magic_treshold;\r
       ip->prio=lowest_priority;\r