diff options
| author | Ravi Kerur <ravi.kerur@viasat.com> | 2019-09-21 10:38:04 -0700 |
|---|---|---|
| committer | Ravi Kerur <ravi.kerur@viasat.com> | 2019-09-21 10:38:04 -0700 |
| commit | e8d501158e07af7dbe67cc795d64532031a4f1d4 (patch) | |
| tree | 52a31be1b88e41ec911f07c2dd3755109ea61929 | |
| parent | d92015a0921c6cefd29c3ea7aa29e6994659f951 (diff) | |
Restore protocol extraction to original method.
Add microseconds to time series if milliseconds returns 0.
Signed-off-by: Ravi Kerur <ravi.kerur@viasat.com>
| -rw-r--r-- | example/reader_util.c | 4 | ||||
| -rw-r--r-- | src/include/ndpi_classify.h | 1 | ||||
| -rw-r--r-- | src/lib/ndpi_classify.c | 38 |
3 files changed, 33 insertions, 10 deletions
diff --git a/example/reader_util.c b/example/reader_util.c index 0b4e6c2c8..a5c99a88b 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -664,13 +664,13 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow l4_offset = iph->ihl * 4; l3 = (const u_int8_t*)iph; - *proto = iph->protocol; } else { l4_offset = sizeof(struct ndpi_ipv6hdr); l3 = (const u_int8_t*)iph6; - *proto = iph6->ip6_hdr.ip6_un1_nxt; } + *proto = iph->protocol; + if(l4_packet_len < 64) workflow->stats.packet_len[0]++; else if(l4_packet_len >= 64 && l4_packet_len < 128) diff --git a/src/include/ndpi_classify.h b/src/include/ndpi_classify.h index 9b5f2841f..cd03027d8 100644 --- a/src/include/ndpi_classify.h +++ b/src/include/ndpi_classify.h @@ -87,6 +87,7 @@ unsigned int ndpi_timer_lt(const struct timeval *a, const struct timeval *b); void ndpi_timer_sub(const struct timeval *a, const struct timeval *b, struct timeval *result); void ndpi_timer_clear(struct timeval *a); unsigned int ndpi_timeval_to_milliseconds(struct timeval ts); +unsigned int ndpi_timeval_to_microseconds(struct timeval ts); void ndpi_log_timestamp(char *log_ts, u_int log_ts_len); #endif /* NDPI_CLASSIFY_H */ diff --git a/src/lib/ndpi_classify.c b/src/lib/ndpi_classify.c index 96b2ecbb0..7a814f7ce 100644 --- a/src/lib/ndpi_classify.c +++ b/src/lib/ndpi_classify.c @@ -299,6 +299,8 @@ ndpi_merge_splt_arrays (const uint16_t *pkt_len, const struct timeval *pkt_time, tmp = pkt_time_twin[r]; ndpi_timer_sub(&tmp, &ts_start, &tmp_r); merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r); + if (merged_times[s+r] == 0) + merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r); ts_start = tmp; r++; } else if (r >= r_idx) { @@ -306,27 +308,35 @@ ndpi_merge_splt_arrays (const uint16_t *pkt_len, const struct timeval *pkt_time, tmp = pkt_time[s]; ndpi_timer_sub(&tmp, &ts_start, &tmp_r); merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r); + if (merged_times[s+r] == 0) + merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r); ts_start = tmp; s++; } else { if (ndpi_timer_lt(&pkt_time[s], &pkt_time_twin[r])) { merged_lens[s+r] = pkt_len[s]; - tmp = pkt_time[s]; - ndpi_timer_sub(&tmp, &ts_start, &tmp_r); - merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r); - ts_start = tmp; + tmp = pkt_time[s]; + ndpi_timer_sub(&tmp, &ts_start, &tmp_r); + merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r); + if (merged_times[s+r] == 0) + merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r); + ts_start = tmp; s++; } else { merged_lens[s+r] = pkt_len_twin[r]; - tmp = pkt_time_twin[r]; - ndpi_timer_sub(&tmp, &ts_start, &tmp_r); - merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r); - ts_start = tmp; + tmp = pkt_time_twin[r]; + ndpi_timer_sub(&tmp, &ts_start, &tmp_r); + merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r); + if (merged_times[s+r] == 0) + merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r); + ts_start = tmp; r++; } } } merged_times[0] = ndpi_timeval_to_milliseconds(start_m); + if (merged_times[0] == 0) + merged_times[0] = ndpi_timeval_to_microseconds(start_m); } /* transform lens array to Markov chain */ @@ -656,6 +666,18 @@ ndpi_timeval_to_milliseconds(struct timeval ts) return result; } +/** + * \brief Calculate the microseconds representation of a timeval. + * \param ts Timeval + * \return unsigned int - Milliseconds + */ +unsigned int +ndpi_timeval_to_microseconds(struct timeval ts) +{ + unsigned int result = ts.tv_usec + ts.tv_sec * 1000 * 1000; + return result; +} + void ndpi_log_timestamp(char *log_ts, u_int log_ts_len) { |