if (ident->common.max_flow_rate > 0) {
ideal_weight = (double) ident->locallimit / (double) ident->common.max_flow_rate;
- printlog(LOG_DEBUG, "%.3f %d %d FlowCount, TotalRate, MaxRate\n",
- ideal_weight, ident->common.rate, ident->common.max_flow_rate);
+ printlog(LOG_DEBUG, "%.3f %d %d %d FlowCount, Limit, MaxRate, TotalRate\n",
+ ideal_weight, ident->locallimit, ident->common.max_flow_rate, ident->common.rate);
} else {
ideal_weight = 1;
}
common_accounting_t *ftable = &ident->common; /* Common flow table info */
uint32_t local_rate = ftable->rate;
uint32_t ideallocal = 0;
- double peer_weights; /* sum of weights of all other limiters */
+ double peer_weights; /* sum of weights of all other limiters */
double idealweight = 0;
double last_portion = 0;
double this_portion = 0;
}
if (printcounter <= 0) {
- printlog(LOG_WARN, "%d %.1f %.1f %.1f %d %d %d %d %d %d ", local_rate, idealweight,
+ printlog(LOG_WARN, "%d %.2f %.2f %.2f %d %d %d %d %d %d ", local_rate, idealweight,
ident->localweight, total_weight, ftable->num_flows, ftable->num_flows_5k, ftable->num_flows_10k,
ftable->num_flows_20k, ftable->num_flows_50k, ftable->avg_rate);
printcounter = PRINT_COUNTER_RESET;
uint8_t system_loglevel;
inline void printlog(const uint8_t level, const char *format, ...) {
- va_list args;
-
if (system_loglevel <= level) {
+ va_list args;
+
va_start(args, format);
vfprintf(logfile, format, args);
va_end(args);
dst.s_addr = ntohl(flow->dest_ip);
strcpy(sip, inet_ntoa(src));
strcpy(dip, inet_ntoa(dst));
- printlog(LOG_DEBUG, "ALLOC:%s:%hd -> %s:%hd\n", sip,
+ printlog(LOG_DEBUG, "ALLOC:%s:%hu -> %s:%hu\n", sip,
flow->source_port, dip, flow->dest_port);
}