Add test for constant interval greater than 1000ms

rigtorp · Dec 31, 2019 · 43070a6 · 43070a6 · sobomax · Feb 26, 2020
1 parent a568aa2
commit 43070a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,7 @@ install(TARGETS udpreplay DESTINATION bin/)
 enable_testing()
 
 add_test(constant-interval ${CMAKE_SOURCE_DIR}/test/constant-interval.expect)
+add_test(constant-interval-ge1 ${CMAKE_SOURCE_DIR}/test/constant-interval-ge1.expect)
 
 add_test(high-speed ${CMAKE_SOURCE_DIR}/test/high-speed.expect)
 

diff --git a/src/udpreplay.cpp b/src/udpreplay.cpp
@@ -201,7 +201,7 @@ int main(int argc, char *argv[]) {
       if (interval != -1) {
         // Use constant packet rate
         deadline.tv_sec += interval / 1000L;
-        deadline.tv_nsec += interval * 1000000L;
+        deadline.tv_nsec += (interval * 1000000L) % NANOSECONDS_PER_SECOND;
       } else {
         // Next packet deadline = start + (packet ts - first packet ts) * speed
         int64_t delta =

diff --git a/test/constant-interval-ge1.expect b/test/constant-interval-ge1.expect
@@ -0,0 +1,10 @@
+#!/usr/bin/expect -f
+
+# Deadline was not incremented correctly for intervals greater than 1000ms
+
+spawn time -p ./udpreplay -i lo -c 1001 ../test/test.pcap
+wait
+expect {
+    default { exit 1 }  
+    "real 3.0" { exit 0 }
+}