- printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
- printf("(down: %dk-%dk ", ip->min, ip->max); \r
+ int min_mbps = (ip->min/ip->keyword->download_aggregation)>>10;\r
+ if(min_mbps < 1)\r
+ {\r
+ min_mbps = 1;\r
+ }\r
+ \r
+ if(min_mbps <= avg_mbps_down)\r
+ {\r
+ unshape_this_ip = 0;\r
+ agreg = (int)((float)(avg_mbps_down+1)/min_mbps+.5);\r
+ ip->max /= agreg;\r
+ ip->pps_limit /= agreg;\r
+ printf("Download aggregation 1:%d for %s (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_down);\r
+ }\r
+ else\r
+ {\r
+ unshape_this_ip = 1;\r
+ }\r
+ }\r
+ else if(ip->keyword->upload_aggregation)\r
+ {\r
+ int min_mbps = (ip->min/ip->keyword->upload_aggregation)>>10;\r
+ if(min_mbps < 1)\r
+ {\r
+ min_mbps = 1;\r
+ }\r
+\r
+ if(min_mbps <= avg_mbps_up)\r
+ {\r
+ unshape_this_ip = 0;\r
+ agreg = (int)((float)(avg_mbps_up+1)/min_mbps+.5);\r
+ ip->max /= agreg;\r
+ printf("Upload aggregation 1:%d for %s: (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);\r
+ }\r
+ else\r
+ {\r
+ unshape_this_ip = 1;\r
+ }\r
+ }\r
+ if(stop_shaping)\r
+ {\r
+ unshape_this_ip = 1;\r
+ }\r
+ ip->aggregated = agreg; \r
+ ip->mark = atoi(ptr);\r
+ if(ip->max < ip->desired || unshape_this_ip || reduce_ceil) /* apply or disable FUP limit immediately.... */\r
+ {\r
+ if(unshape_this_ip)\r
+ {\r
+ ip->max = ip->desired;\r
+ if(stop_shaping) /* all limits removed, but not printed with -s (start_shaping) switch */\r
+ {\r
+ printf("Removing limit for %s (%s) ", ip->name, ip->addr);\r
+ }\r
+ else\r
+ {\r
+ print_stats = 0;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ printf("Applying limit for %s (%s) ", ip->name, ip->addr);\r
+ if(reduce_ceil)\r
+ {\r
+ ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;\r
+ }\r
+ else if(ip->max < ip->min)\r
+ {\r
+ ip->max = ip->min;\r
+ } \r
+ }\r
+ if(print_stats)\r
+ {\r
+ printf("(down: %dk-%dk wants %dk, ", ip->min, ip->max, ip->desired);\r
+ }\r