1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
Description: fix float precision bug while using timestamps as keys
When using the timestamps from the input pcap, the float precision used is 6
However, by default Perl uses a precision of 5 for usage as a key in a hash.
.
This is problematic when the delta of 2 packets is less then 0.00001, as some
of the packets will be overwritten during reading the input file.
.
This patch fixes this by first turning the timestamp into a string, using a
precision of 6.
Author: Marinus Boekelo <ruzzle@me.info>
Origin: https://github.com/ruzzle/Chaosreader/commit/a0cf0e6e15319bb36245c8e9d8a7983407f52d70
Reviewed-By: Joao Eriberto Mota Filho <eriberto@debian.org>
Last-Update: 2021-08-21
Index: chaosreader/chaosreader
===================================================================
--- chaosreader.orig/chaosreader
+++ chaosreader/chaosreader
@@ -1073,13 +1073,14 @@ sub Read_Input_File {
# Store IP data in %IP so we can do frag reassembly next
#
if (! defined $IP{id}{$ip_id}{StartTime}) {
- $IP{time}{$packet_timefull}{ver} = $ip_ver;
- $IP{time}{$packet_timefull}{src} = $ip_src;
- $IP{time}{$packet_timefull}{dest} = $ip_dest;
- $IP{time}{$packet_timefull}{protocol} = $ip_protocol;
- $IP{time}{$packet_timefull}{frag}{$ip_frag} = $ip_data;
+ $packet_timefull_str = sprintf("%.06f",$packet_timefull);
+ $IP{time}{$packet_timefull_str}{ver} = $ip_ver;
+ $IP{time}{$packet_timefull_str}{src} = $ip_src;
+ $IP{time}{$packet_timefull_str}{dest} = $ip_dest;
+ $IP{time}{$packet_timefull_str}{protocol} = $ip_protocol;
+ $IP{time}{$packet_timefull_str}{frag}{$ip_frag} = $ip_data;
if ($snoop_drops || $tcpdump_drops) {
- $IP{time}{$packet_timefull}{drops} = 1;
+ $IP{time}{$packet_timefull_str}{drops} = 1;
}
#
# If there are more fragments, remember this starttime
@@ -1088,13 +1089,13 @@ sub Read_Input_File {
$IP{id}{$ip_id}{StartTime} = $packet_timefull;
}
if (($ip_MF == 1) || ($ip_frag > 0)) {
- $IP{time}{$packet_timefull}{fragged} = 1;
+ $IP{time}{$packet_timefull_str}{fragged} = 1;
}
} else {
$start_time = $IP{id}{$ip_id}{StartTime};
- $IP{time}{$start_time}{frag}{$ip_frag} = $ip_data;
+ $IP{time}{sprintf("%.06f", $start_time)}{frag}{$ip_frag} = $ip_data;
if ($snoop_drops || $tcpdump_drops) {
- $IP{time}{$packet_timefull}{drops} = 1;
+ $IP{time}{$packet_timefull_str}{drops} = 1;
}
if ($ip_MF == 0) {
#
|
