restore previously removed bandwidth limit configuration sanity check as it could still save huge spikes from getting recorded in edge cases

Author: vergoh

CHANGES

@@ -3,8 +3,6 @@
  - Fixed
    - Opening of body html tag was missing on some pages in image output
      example cgi (examples/vnstat.cgi)
-   - Unnecessary bandwidth limit configuration sanity check removed when
-     interface counters are in 64-bit range without overflow detected
  - New
    - Add database data merge support as --merge
    - Add --db for specifying database file for queries (vnstat and vnstati)

src/daemon.c

@@ -553,7 +553,7 @@ int processifinfo(DSTATE *s, datacache **dc)
 	uint64_t maxtransfer;
 	uint32_t maxbw;
 	time_t interval;
-	short detected64bit = 0, noreset64bit = 0;
+	short detected64bit = 0;
 
 	if ((*dc)->syncneeded) { /* if --sync was used during startup */
 		(*dc)->currx = ifinfo.rx;
@@ -583,10 +583,6 @@ int processifinfo(DSTATE *s, datacache **dc)
 			detected64bit = 1;
 		}
 
-		if ((ifinfo.rx > MAX32 && ifinfo.rx >= (*dc)->currx) || (ifinfo.tx > MAX32 && ifinfo.tx >= (*dc)->curtx)) {
-			noreset64bit = 1;
-		}
-
 		rxchange = countercalc(&(*dc)->currx, &ifinfo.rx, ifinfo.is64bit);
 		txchange = countercalc(&(*dc)->curtx, &ifinfo.tx, ifinfo.is64bit);
 
@@ -600,16 +596,10 @@ int processifinfo(DSTATE *s, datacache **dc)
 			}
 		}
 
-		/* trust interface data without limits when counters are 64-bit and over maximum 32-bit range without both having overflown */
-		if (noreset64bit) {
-			maxbw = 0;
-		} else {
-			/* get bandwidth limit for current interface */
-			ibwget((*dc)->interface, &maxbw);
-		}
+		/* get bandwidth limit for current interface */
+		ibwget((*dc)->interface, &maxbw);
 
 		if (maxbw > 0) {
-
 			/* calculate maximum possible transfer since last update based on set maximum rate */
 			/* and add 2% in order to be on the safe side */
 			maxtransfer = (uint64_t)(ceilf(((float)maxbw / (float)8) * (float)interval * (float)1.02)) * 1024 * 1024;

tests/daemon_tests.c

@@ -1363,7 +1363,7 @@ START_TEST(processifinfo_does_not_add_traffic_when_over_limit)
 }
 END_TEST
 
-START_TEST(processifinfo_adds_traffic_when_over_limit_with_64bit)
+START_TEST(processifinfo_does_not_add_add_traffic_when_over_limit_with_64bit)
 {
 	int ret;
 	DSTATE s;
@@ -1395,9 +1395,7 @@ START_TEST(processifinfo_adds_traffic_when_over_limit_with_64bit)
 	ck_assert_int_eq(s.dcache->syncneeded, 0);
 	ck_assert(s.dcache->currx == (MAX32 + 1111111));
 	ck_assert(s.dcache->curtx == (MAX32 + 2222222));
-	ck_assert_ptr_ne(s.dcache->log, NULL);
-	ck_assert_int_eq(s.dcache->log->rx, 1111110);
-	ck_assert_int_eq(s.dcache->log->tx, 2222221);
+	ck_assert_ptr_eq(s.dcache->log, NULL);
 
 	datacache_clear(&s.dcache);
 }
@@ -1673,7 +1671,7 @@ void add_daemon_tests(Suite *s)
 	tcase_add_test(tc_daemon, processifinfo_syncs_if_timestamps_match);
 	tcase_add_test(tc_daemon, processifinfo_adds_traffic);
 	tcase_add_test(tc_daemon, processifinfo_does_not_add_traffic_when_over_limit);
-	tcase_add_test(tc_daemon, processifinfo_adds_traffic_when_over_limit_with_64bit);
+	tcase_add_test(tc_daemon, processifinfo_does_not_add_add_traffic_when_over_limit_with_64bit);
 	tcase_add_test(tc_daemon, processifinfo_adds_zero_traffic_when_over_limit);
 	tcase_add_test(tc_daemon, datacache_status_can_handle_nothing);
 	tcase_add_test(tc_daemon, datacache_status_can_show_limits);