diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /src/common/captureFile.cpp | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'src/common/captureFile.cpp')
| -rwxr-xr-x | src/common/captureFile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/captureFile.cpp b/src/common/captureFile.cpp index b3035e8a..a25d1c42 100755 --- a/src/common/captureFile.cpp +++ b/src/common/captureFile.cpp @@ -135,7 +135,7 @@ bool CCapPktRaw::Compare(CCapPktRaw * obj,int dump,double dsec){ CPktNsecTimeStamp t2(obj->time_sec,obj->time_nsec); if ( t1.diff(t2) > dsec ){ if ( dump ){ - printf(" ERROR: diff of 1 msec in time \n"); + printf(" ERROR: diff of %lf seconds while only %lf allowed\n", t1.diff(t2), dsec); } return (false); } |