From 09b44977782c79ff983dbae1112192c0c3e660d4 Mon Sep 17 00:00:00 2001 From: Karsten Schmidt Date: Mon, 1 Aug 2016 14:46:33 +0200 Subject: [PATCH] When ifSpeed is not returned by the switch, billing was broken. --- poll-billing.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poll-billing.php b/poll-billing.php index 9ad32e590c..8bc7be9a4d 100755 --- a/poll-billing.php +++ b/poll-billing.php @@ -75,7 +75,7 @@ function CollectData($bill_id) { $tmp_period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('".mres($last_counters['timestamp'])."')"); - if ((delta_to_bits($port_data['in_measurement'], $tmp_period)-delta_to_bits($port_data['last_in_measurement'], $tmp_period)) > $port_data['ifSpeed']) { + if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['in_measurement'], $tmp_period)-delta_to_bits($port_data['last_in_measurement'], $tmp_period)) > $port_data['ifSpeed']) { $port_data['in_delta'] = $port_data['last_in_delta']; } elseif ($port_data['in_measurement'] >= $port_data['last_in_measurement']) { @@ -85,7 +85,7 @@ function CollectData($bill_id) { $port_data['in_delta'] = $port_data['last_in_delta']; } - if ((delta_to_bits($port_data['out_measurement'], $tmp_period)-delta_to_bits($port_data['last_out_measurement'], $tmp_period)) > $port_data['ifSpeed']) { + if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['out_measurement'], $tmp_period)-delta_to_bits($port_data['last_out_measurement'], $tmp_period)) > $port_data['ifSpeed']) { $port_data['out_delta'] = $port_data['last_out_delta']; } elseif ($port_data['out_measurement'] >= $port_data['last_out_measurement']) {